Merge "Clear up permission READ_PRIVILEGED_PHONE_STATE." (07acec49) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -9118,9 +9118,9 @@ package android.telephony {
		field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000
		field @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000
		field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_CALL_STATE = 2048; // 0x800
		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_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
		field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
		}

		public final class PreciseCallState implements android.os.Parcelable {

core/java/android/telephony/PhoneStateListener.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -225,6 +225,9 @@ public class PhoneStateListener {

		/**
		* Listen for changes to the SRVCC state of the active call.
		*
		* <p>Requires permission {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}
		*
		* @see #onServiceStateChanged(ServiceState)
		* @hide
		*/
		@@ -253,6 +256,9 @@ public class PhoneStateListener {

		/**
		* Listen for changes to the sim voice activation state
		*
		* <p>Requires permission {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}
		*
		* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATING
		* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED
		* @see TelephonyManager#SIM_ACTIVATION_STATE_DEACTIVATED
		@@ -266,6 +272,7 @@ public class PhoneStateListener {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public static final int LISTEN_VOICE_ACTIVATION_STATE = 0x00020000;

		/**
		@@ -312,10 +319,13 @@ public class PhoneStateListener {
		/**
		* Listen for changes to the radio power state.
		*
		* <p>Requires permission {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}
		*
		* @see #onRadioPowerStateChanged
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 0x00800000;

		/**
		@@ -893,7 +903,6 @@ public class PhoneStateListener {
		* Callback invoked when phone capability changes.
		* Note, this callback triggers regardless of registered subscription.
		*
		* Requires the READ_PRIVILEGED_PHONE_STATE permission.
		* @param capability the new phone capability
		* @hide
		*/
		@@ -923,7 +932,7 @@ public class PhoneStateListener {
		* subId. Otherwise, this callback applies to
		* {@link SubscriptionManager#getDefaultSubscriptionId()}.
		*
		* Requires the READ_PRIVILEGED_PHONE_STATE permission.
		* Requires the READ_PRECISE_PHONE_STATE permission.
		* @param callAttributes the call attributes
		* @hide
		*/

services/core/java/com/android/server/TelephonyRegistry.java

+7 −21

Original line number	Diff line number	Diff line
		@@ -296,6 +296,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL
		\| PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_SMS;

		static final int READ_PRIVILEGED_PHONE_STATE_PERMISSION_MASK =
		PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT
		\| PhoneStateListener.LISTEN_SRVCC_STATE_CHANGED
		\| PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED
		\| PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE;

		private static final int MSG_USER_SWITCHED = 1;
		private static final int MSG_UPDATE_DEFAULT_SUB = 2;

		@@ -2448,27 +2454,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION, null);
		}

		if ((events & PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH, null);
		}

		if ((events & PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
		}

		if ((events & PhoneStateListener.LISTEN_SRVCC_STATE_CHANGED) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
		}

		if ((events & PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
		}

		if ((events & PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE) != 0) {
		if ((events & READ_PRIVILEGED_PHONE_STATE_PERMISSION_MASK) != 0) {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);
		}