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

Commit 77070487 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Create config KEY_ADDITIONAL_NR_ADVANCED_BAND_INT_ARRAY" into sc-dev am: b4f7678c 

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

Change-Id: I28098a49ae163ba8b718278cd24b753b4516a571
parents 1b8b0109 b4f7678c

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -3462,6 +3462,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
@@ -5395,6 +5405,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);