Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f6d7d9 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Add NR to global mode" into sc-qpr1-dev am: 21cb293e am: 958235b4 am: a86772a3 

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

Change-Id: Iee3aae437c227036d869d335d4fcb951bf9fb9ec
parents 42b9db2d a86772a3

telephony/java/android/telephony/TelephonyManager.java

+5 −3
Original line number Diff line number Diff line
@@ -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}).















     *









@@ -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}).















     *









@@ -8873,7 +8875,7 @@ public class TelephonyManager {













     * @hide















     */















    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);















    }





























    /**