Merge "Support always reporting signal strength phone state listener" (c3de6ca9) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

core/java/android/telephony/PhoneStateListener.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -167,6 +167,16 @@ public class PhoneStateListener {
	*/		*/
	public static final int LISTEN_SIGNAL_STRENGTHS = 0x00000100;		public static final int LISTEN_SIGNAL_STRENGTHS = 0x00000100;

			/**
			* Listen for always reported changes of the network signal strengths (cellular),
			* even in some situations such as the screen of the device is off.
			*
			* @hide
			*/
			@RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
			@SystemApi
			public static final int LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = 0x00000200;

	/**		/**
	* Listen for changes to observed cell info.		* Listen for changes to observed cell info.
	*		*

core/res/AndroidManifest.xml

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2091,6 +2091,11 @@
	<permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"		<permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"
	android:protectionLevel="signature" />		android:protectionLevel="signature" />

			<!-- @SystemApi Allows listen permission to always reported signal strength.
			@hide Used internally. -->
			<permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"
			android:protectionLevel="signature\|telephony" />

	<!-- @SystemApi Protects the ability to register any PhoneAccount with		<!-- @SystemApi Protects the ability to register any PhoneAccount with
	PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount		PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount
	corresponds to a device SIM.		corresponds to a device SIM.

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

+38 −0

Original line number	Original line	Diff line number	Diff line
	@@ -885,6 +885,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
	remove(r.binder);		remove(r.binder);
	}		}
	}		}
			if ((events & PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
			!= 0) {
			updateReportSignalStrengthDecision(r.subId);
			}
	if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO)) {		if (validateEventsAndUserLocked(r, PhoneStateListener.LISTEN_CELL_INFO)) {
	try {		try {
	if (DBG_LOC) log("listen: mCellInfo[" + phoneId + "] = "		if (DBG_LOC) log("listen: mCellInfo[" + phoneId + "] = "
	@@ -1021,6 +1025,27 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
	}		}
	}		}

			private void updateReportSignalStrengthDecision(int subscriptionId) {
			synchronized (mRecords) {
			TelephonyManager telephonyManager = (TelephonyManager) mContext
			.getSystemService(Context.TELEPHONY_SERVICE);
			for (Record r : mRecords) {
			// If any of the system clients wants to always listen to signal strength,
			// we need to set it on.
			if (r.matchPhoneStateListenerEvent(
			PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)) {
			telephonyManager.createForSubscriptionId(subscriptionId)
			.setAlwaysReportSignalStrength(true);
			return;
			}
			}
			// If none of the system clients wants to always listen to signal strength,
			// we need to set it off.
			telephonyManager.createForSubscriptionId(subscriptionId)
			.setAlwaysReportSignalStrength(false);
			}
			}

	private String getCallIncomingNumber(Record record, int phoneId) {		private String getCallIncomingNumber(Record record, int phoneId) {
	// Only reveal the incoming number if the record has read call log permission.		// Only reveal the incoming number if the record has read call log permission.
	return record.canReadCallLog() ? mCallIncomingNumber[phoneId] : "";		return record.canReadCallLog() ? mCallIncomingNumber[phoneId] : "";
	@@ -1078,6 +1103,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
	}		}

	mRecords.remove(i);		mRecords.remove(i);

			// Every time a client that is registrating to always receive the signal
			// strength is removed from registry records, we need to check if
			// the signal strength decision needs to update on its slot.
			if (r.matchPhoneStateListenerEvent(
			PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)) {
			updateReportSignalStrengthDecision(r.subId);
			}
	return;		return;
	}		}
	}		}
	@@ -2494,6 +2527,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
	android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION, null);		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) {		if ((events & PhoneStateListener.LISTEN_OEM_HOOK_RAW_EVENT) != 0) {
	mContext.enforceCallingOrSelfPermission(		mContext.enforceCallingOrSelfPermission(
	android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, null);

telephony/java/android/telephony/TelephonyManager.java

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11040,6 +11040,27 @@ public class TelephonyManager {
	return true;		return true;
	}		}

			/**
			* Enable or disable signal strength changes from radio will always be reported in any
			* condition (e.g. screen is off). This is only allowed for System caller.
			*
			* @param isEnabled {@code true} for enabling; {@code false} for disabling.
			* @hide
			*/
			@SystemApi
			@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
			public void setAlwaysReportSignalStrength(boolean isEnabled) {
			try {
			ITelephony telephony = getITelephony();
			if (telephony != null) {
			telephony.setAlwaysReportSignalStrength(getSubId(), isEnabled);
			}
			} catch (RemoteException ex) {
			Log.e(TAG, "setAlwaysReportSignalStrength RemoteException", ex);
			ex.rethrowAsRuntimeException();
			}
			}

	/**		/**
	* Get the most recently available signal strength information.		* Get the most recently available signal strength information.
	*		*