Merge "Merge "API review: setNetworkSelectionModeManual" into rvc-dev am:... (d3f2a5e7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -48243,6 +48243,7 @@ package android.telephony {
		method public boolean setLine1NumberForDisplay(String, String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setNetworkSelectionModeAutomatic();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(String, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, boolean, int);
		method public boolean setOperatorBrandOverride(String);
		method public boolean setPreferredNetworkTypeToGlobal();
		method public void setPreferredOpportunisticDataSubscription(int, boolean, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.Consumer<java.lang.Integer>);

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -11781,7 +11781,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setIccLockEnabled(boolean, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);

telephony/java/android/telephony/TelephonyManager.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -7932,21 +7932,19 @@ public class TelephonyManager {
		* app has carrier privileges (see {@link #hasCarrierPrivileges}).
		*
		* @param operatorNumeric the PLMN ID of the network to select.
		* @param persistSelection whether the selection will persist until reboot.
		* If true, only allows attaching to the selected PLMN until reboot; otherwise,
		* attach to the chosen PLMN and resume normal network selection next time.
		* @param ran the initial suggested radio access network type.
		* If registration fails, the RAN is not available after, the RAN is not within the
		* network types specified by {@link #setPreferredNetworkTypeBitmask}, or the value is
		* network types specified by the preferred network types, or the value is
		* {@link AccessNetworkConstants.AccessNetworkType#UNKNOWN}, modem will select
		* the next best RAN for network registration.
		* @param persistSelection whether the selection will persist until reboot.
		* If true, only allows attaching to the selected PLMN until reboot; otherwise,
		* attach to the chosen PLMN and resume normal network selection next time.
		* @return {@code true} on success; {@code false} on any failure.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		@SystemApi
		public boolean setNetworkSelectionModeManual(@NonNull String operatorNumeric,
		@AccessNetworkConstants.RadioAccessNetworkType int ran, boolean persistSelection) {
		boolean persistSelection, @AccessNetworkConstants.RadioAccessNetworkType int ran) {
		return setNetworkSelectionModeManual(new OperatorInfo("" /* operatorAlphaLong */,
		"" /* operatorAlphaShort */, operatorNumeric, ran), persistSelection);
		}