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

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

Merge "Add carrier config for NR timer reset" into rvc-d1-dev am: 08a86e72 

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

Change-Id: I64c56a435f7e685c7002a15670850477797cc014
parents 21c84b61 08a86e72

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -3178,6 +3178,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
@@ -4277,6 +4288,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);