Merge "Exposing Manual Network Selection Config" (6bc3f6ba) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -47209,6 +47209,7 @@ package android.telephony {
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei(int);
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public String getManualNetworkSelectionPlmn();
		method @Nullable public String getManufacturerCode();
		method @Nullable public String getManufacturerCode(int);
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getMeid();
		@@ -47264,6 +47265,7 @@ package android.telephony {
		method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
		method public boolean isEmergencyNumber(@NonNull String);
		method public boolean isHearingAidCompatibilitySupported();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();
		method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();
		method public boolean isNetworkRoaming();
		method public boolean isRttSupported();

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -12022,7 +12022,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @WorkerThread public boolean isIccLockEnabled();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isInEmergencySmsMode();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isManualNetworkSelectionAllowed();
		method public boolean isModemEnabledForSlot(int);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isOpportunisticNetworkEnabled();

telephony/java/android/telephony/TelephonyManager.java

+31 −4

Original line number	Diff line number	Diff line
		@@ -8094,6 +8094,30 @@ public class TelephonyManager {
		return mode;
		}

		/**
		* Get the PLMN chosen for Manual Network Selection if active.
		* Return empty string if in automatic selection.
		*
		* <p>Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE} or that the calling app has carrier privileges
		* (see {@link #hasCarrierPrivileges})
		*
		* @return manually selected network info on success or empty string on failure
		*/
		@SuppressAutoDoc // No support carrier privileges (b/72967236).
		@RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE)
		public @NonNull String getManualNetworkSelectionPlmn() {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null && isManualNetworkSelectionAllowed()) {
		return telephony.getManualNetworkSelectionPlmn(getSubId());
		}
		} catch (RemoteException ex) {
		Rlog.e(TAG, "getManualNetworkSelectionPlmn RemoteException", ex);
		}
		return "";
		}

		/**
		* Query Telephony to see if there has recently been an emergency SMS sent to the network by the
		* user and we are still within the time interval after the emergency SMS was sent that we are
		@@ -11147,15 +11171,18 @@ public class TelephonyManager {
		/**
		* Checks if manual network selection is allowed.
		*
		* <p>Requires Permission: {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE
		* READ_PRECISE_PHONE_STATE} or that the calling app has carrier privileges
		* (see {@link #hasCarrierPrivileges})
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}.
		*
		* @return {@code true} if manual network selection is allowed, otherwise return {@code false}.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@SuppressAutoDoc // No support carrier privileges (b/72967236).
		@RequiresPermission(anyOf = {android.Manifest.permission.READ_PRECISE_PHONE_STATE,
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE})
		public boolean isManualNetworkSelectionAllowed() {
		try {
		ITelephony telephony = getITelephony();

telephony/java/com/android/internal/telephony/ITelephony.aidl

+9 −0

Original line number	Diff line number	Diff line
		@@ -2197,4 +2197,13 @@ interface ITelephony {
		* This is safe to call from any thread, with any window manager locks held or not.
		*/
		oneway void userActivity();

		/**
		* Get the user manual network selection.
		* Return empty string if in automatic selection.
		*
		* @param subId the id of the subscription
		* @return operatorinfo on success
		*/
		String getManualNetworkSelectionPlmn(int subId);
		}