From b2667cc56175f3600d97eaee4d4f2bb5d8015816 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Wed, 26 Feb 2020 15:27:52 -0800 Subject: [PATCH] API review: setNetworkSelectionModeManual Move optional ran parameter to end Make system -> public API Test: atest FrameworksTelephonyTests Bug: 150127236 Change-Id: I140477b2778158646dbbcb0d2a32033c61bb97e4 Merged-In: I140477b2778158646dbbcb0d2a32033c61bb97e4 --- api/current.txt | 1 + api/system-current.txt | 1 - .../java/android/telephony/TelephonyManager.java | 14 ++++++-------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/api/current.txt b/api/current.txt index bb22eccce0b96..e6b07407ac0d1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -45961,6 +45961,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); diff --git a/api/system-current.txt b/api/system-current.txt index 3dc9cc652494c..685102d86bf08 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9432,7 +9432,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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0d86a99afc74d..7d5945f1ef377 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -7933,21 +7933,19 @@ public class TelephonyManager { * app has carrier privileges (see {@link #hasCarrierPrivileges}). * * @param operatorNumeric the PLMN ID of the network to select. - * @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 - * {@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. + * @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 the preferred network types, or the value is + * {@link AccessNetworkConstants.AccessNetworkType#UNKNOWN}, modem will select + * the next best RAN for network registration. * @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); }