Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for NR timer reset" am: 71b90ae022 am: 8a84baa296

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

Change-Id: I1e1a8a324c441f6992414eeafc99b2cec908982d
This commit is contained in:
Treehugger Robot
2020-07-22 10:40:06 +00:00
committed by Automerger Merge Worker
parent c9de0dd4e2 8a84baa296
commit 8f6335b3fa
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3206,6 +3206,17 @@ public class CarrierConfigManager {
public static final String KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING = public static final String KEY_5G_ICON_DISPLAY_SECONDARY_GRACE_PERIOD_STRING =
"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. * Controls time in milliseconds until DcTracker reevaluates 5G connection state.
* @hide * @hide
@@ -4307,6 +4318,7 @@ public class CarrierConfigManager {
+ "not_restricted_rrc_con:5G"); + "not_restricted_rrc_con:5G");
sDefaults.putString(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING, ""); sDefaults.putString(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_STRING, "");
sDefaults.putString(KEY_5G_ICON_DISPLAY_SECONDARY_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. */ /* Default value is 1 hour. */
sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000); sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);
sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);