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

Commit 5e517486 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY" am: bcb868bd 

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

Change-Id: I47b17f34393bcba6a72531c539a47f6434d286a9
parents 9340e33b bcb868bd

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -3387,6 +3387,16 @@ public class CarrierConfigManager { 
    public static final String KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL =

            "nr_timers_reset_if_non_endc_and_rrc_idle_bool";



    /**

     * A list of additional NR advanced band would map to

     * {@link TelephonyDisplayInfo#OVERRIDE_NETWORK_TYPE_NR_ADVANCED} when the device is on that

     * band.

     *

     * @hide

     */

    public static final String KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY =

            "additional_nr_advanced_bands_int_array";



    /**

     * Controls time in milliseconds until DcTracker reevaluates 5G connection state.

     * @hide
@@ -4878,6 +4888,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL, false);

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putIntArray(KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY, new int[0]);

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