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

Commit 8a84baa2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add carrier config for NR timer reset" am: 71b90ae0 

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

Change-Id: Ifd504c77fb45ceee458899560e24a8c6e1dbfff7
parents f453a23f 71b90ae0

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -3162,6 +3162,17 @@ public class CarrierConfigManager { 
    public static final String KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING =

            "5g_icon_display_secondary_grace_period_string";



    /**

     * Whether device reset all of NR timers when device camped on a network that haven't 5G

     * capability and RRC currently in IDLE state.

     *

     * The default value is false;

     *

     * @hide

     */

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



    /**

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

     * @hide
@@ -4230,6 +4241,7 @@ public class CarrierConfigManager { 
                        + "not_restricted_rrc_con:5G");

        sDefaults.putString(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING, "");

        sDefaults.putString(KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING, "");

        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.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);