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

Commit 64e79671 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add carrier config for roaming meteredness" into rvc-dev am: 22f4b399 

Change-Id: I2b7908323cff737a39ef28bfbe5b65c0408be633
parents cbb3e330 22f4b399

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -3083,6 +3083,16 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_UNMETERED_NR_NSA_SUB6_BOOL = "unmetered_nr_nsa_sub6_bool";



    /**

     * Whether NR (non-standalone) should be unmetered when the device is roaming.

     * If false, then the values for {@link #KEY_UNMETERED_NR_NSA_BOOL},

     * {@link #KEY_UNMETERED_NR_NSA_MMWAVE_BOOL}, {@link #KEY_UNMETERED_NR_NSA_SUB6_BOOL},

     * and unmetered {@link SubscriptionPlan} will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL =

            "unmetered_nr_nsa_when_roaming_bool";



    /**

     * Whether NR (standalone) should be unmetered for all frequencies.

     * If either {@link #KEY_UNMETERED_NR_SA_MMWAVE_BOOL} or
@@ -4134,6 +4144,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_WHEN_ROAMING_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_SA_SUB6_BOOL, false);