Merge "Add NR to global mode" into sc-qpr1-dev am: 21cb293e88 am: 958235b40e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15801503

Change-Id: I848aa8c764ddab27776789c18cfe7ea5a4401ad1
This commit is contained in:
Sooraj Sasindran
2021-09-20 18:34:42 +00:00
committed by Automerger Merge Worker

View File

@@ -8854,7 +8854,8 @@ public class TelephonyManager {
} }
/** /**
* Set the preferred network type to global mode which includes LTE, CDMA, EvDo and GSM/WCDMA. * Set the preferred network type to global mode which includes NR, LTE, CDMA, EvDo
* and GSM/WCDMA.
* *
* <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). * <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
* *
@@ -8865,7 +8866,8 @@ public class TelephonyManager {
} }
/** /**
* Set the preferred network type to global mode which includes LTE, CDMA, EvDo and GSM/WCDMA. * Set the preferred network type to global mode which includes NR, LTE, CDMA, EvDo
* and GSM/WCDMA.
* *
* <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). * <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
* *
@@ -8873,7 +8875,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
public boolean setPreferredNetworkTypeToGlobal(int subId) { public boolean setPreferredNetworkTypeToGlobal(int subId) {
return setPreferredNetworkType(subId, RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA); return setPreferredNetworkType(subId, RILConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
} }
/** /**