Merge "new System API for sim voice activation state." (b332c399) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5168,8 +5168,10 @@ package android.telephony {
		public class PhoneStateListener {
		method public void onRadioPowerStateChanged(int);
		method public void onSrvccStateChanged(int);
		method public void onVoiceActivationStateChanged(int);
		field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000
		field public static final int LISTEN_SRVCC_STATE_CHANGED = 16384; // 0x4000
		field public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
		}

		public class ServiceState implements android.os.Parcelable {

+27 −27

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ public class PhoneStateListener {
		* @see #onVoiceActivationStateChanged
		* @hide
		*/
		@SystemApi
		public static final int LISTEN_VOICE_ACTIVATION_STATE = 0x00020000;

		/**
		@@ -569,8 +570,8 @@ public class PhoneStateListener {
		* @param state is the current SIM voice activation state
		* @hide
		*/
		public void onVoiceActivationStateChanged(int state) {

		@SystemApi
		public void onVoiceActivationStateChanged(@TelephonyManager.SimActivationState int state) {
		}

		/**
		@@ -578,8 +579,7 @@ public class PhoneStateListener {
		* @param state is the current SIM data activation state
		* @hide
		*/
		public void onDataActivationStateChanged(int state) {

		public void onDataActivationStateChanged(@TelephonyManager.SimActivationState int state) {
		}

		/**