Merge "API council feedbacks for preciseCall APIs" am: e05a1cb5db am: c3045478cc (25a4f6f8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+10 −10

Original line number	Diff line number	Diff line
		@@ -7476,7 +7476,7 @@ package android.telephony {
		field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc
		}

		public class DisconnectCause {
		public final class DisconnectCause {
		field public static final int ALREADY_DIALING = 72; // 0x48
		field public static final int ANSWERED_ELSEWHERE = 52; // 0x34
		field public static final int BUSY = 4; // 0x4
		@@ -7654,18 +7654,18 @@ package android.telephony {

		public class PhoneStateListener {
		method public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes);
		method public void onCallDisconnectCauseChanged(int, int);
		method public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		method public void onPreciseCallStateChanged(android.telephony.PreciseCallState);
		method public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onCallDisconnectCauseChanged(int, int);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState);
		method @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public void onPreciseDataConnectionStateChanged(android.telephony.PreciseDataConnectionState);
		method public void onRadioPowerStateChanged(int);
		method public void onSrvccStateChanged(int);
		method public void onVoiceActivationStateChanged(int);
		field public static final int LISTEN_CALL_ATTRIBUTES_CHANGED = 67108864; // 0x4000000
		field public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000
		field public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000
		field public static final int LISTEN_PRECISE_CALL_STATE = 2048; // 0x800
		field public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_CALL_STATE = 2048; // 0x800
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000
		field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000
		field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_SRVCC_STATE_CHANGED = 16384; // 0x4000
		field public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
		@@ -7700,7 +7700,7 @@ package android.telephony {
		field public static final android.os.Parcelable.Creator<android.telephony.PreciseDataConnectionState> CREATOR;
		}

		public class PreciseDisconnectCause {
		public final class PreciseDisconnectCause {
		field public static final int ACCESS_CLASS_BLOCKED = 260; // 0x104
		field public static final int ACCESS_INFORMATION_DISCARDED = 43; // 0x2b
		field public static final int ACM_LIMIT_EXCEEDED = 68; // 0x44

telephony/java/android/telephony/DisconnectCause.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.annotation.UnsupportedAppUsage;
		* @hide
		*/
		@SystemApi
		public class DisconnectCause {
		public final class DisconnectCause {

		/** The disconnect cause is not valid (Not received a disconnect cause) */
		public static final int NOT_VALID = -1;

telephony/java/android/telephony/PhoneStateListener.java

+9 −15

Original line number	Diff line number	Diff line
		@@ -176,26 +176,21 @@ public class PhoneStateListener {

		/**
		* Listen for {@link PreciseCallState.State} of ringing, background and foreground calls.
		* {@more}
		* Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE}
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public static final int LISTEN_PRECISE_CALL_STATE = 0x00000800;

		/**
		* Listen for {@link PreciseDataConnectionState} on the data connection (cellular).
		*
		* {@more}
		* Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE}
		*
		* @see #onPreciseDataConnectionStateChanged
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 0x00001000;

		@@ -331,12 +326,10 @@ public class PhoneStateListener {
		/**
		* Listen for call disconnect causes which contains {@link DisconnectCause} and
		* {@link PreciseDisconnectCause}.
		* {@more}
		* Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE}
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public static final int LISTEN_CALL_DISCONNECT_CAUSES = 0x02000000;

		@@ -356,13 +349,10 @@ public class PhoneStateListener {
		* Listen for IMS call disconnect causes which contains
		* {@link android.telephony.ims.ImsReasonInfo}
		*
		* {@more}
		* Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE}
		*
		* @see #onImsCallDisconnectCauseChanged(ImsReasonInfo)
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 0x08000000;

		@@ -579,8 +569,9 @@ public class PhoneStateListener {
		* @param callState {@link PreciseCallState}
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public void onPreciseCallStateChanged(PreciseCallState callState) {
		public void onPreciseCallStateChanged(@NonNull PreciseCallState callState) {
		// default implementation empty
		}

		@@ -591,6 +582,7 @@ public class PhoneStateListener {
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public void onCallDisconnectCauseChanged(int disconnectCause, int preciseDisconnectCause) {
		// default implementation empty
		@@ -602,6 +594,7 @@ public class PhoneStateListener {
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public void onImsCallDisconnectCauseChanged(@NonNull ImsReasonInfo imsReasonInfo) {
		// default implementation empty
		@@ -613,6 +606,7 @@ public class PhoneStateListener {
		*
		* @hide
		*/
		@RequiresPermission((android.Manifest.permission.READ_PRECISE_PHONE_STATE))
		@SystemApi
		public void onPreciseDataConnectionStateChanged(
		PreciseDataConnectionState dataConnectionState) {

telephony/java/android/telephony/PreciseDisconnectCause.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.annotation.SystemApi;
		* @hide
		*/
		@SystemApi
		public class PreciseDisconnectCause {
		public final class PreciseDisconnectCause {

		/** The disconnect cause is not valid (Not received a disconnect cause).*/
		public static final int NOT_VALID = -1;