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

Commit 7d217a8a authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Default resetting timers upon qos voice call" into main

parents 85c45b20 0e3b7e7d

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3888,7 +3888,7 @@ public class CarrierConfigManager { 














    /**















     * Whether device resets all of NR timers when device is in a voice call and QOS is established.













     * The default value is false;













     * The default value is true;















     *















     * @see #KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING















     * @see #KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING










@@ -10909,7 +10909,7 @@ public class CarrierConfigManager {













        sDefaults.putString(KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING, "");















        sDefaults.putInt(KEY_NR_ADVANCED_BANDS_SECONDARY_TIMER_SECONDS_INT, 0);















        sDefaults.putBoolean(KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL, false);













        sDefaults.putBoolean(KEY_NR_TIMERS_RESET_ON_VOICE_QOS_BOOL, false);













        sDefaults.putBoolean(KEY_NR_TIMERS_RESET_ON_VOICE_QOS_BOOL, true);















        sDefaults.putBoolean(KEY_NR_TIMERS_RESET_ON_PLMN_CHANGE_BOOL, false);















        /* Default value is 1 hour. */















        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);