From a88f75d09730d16325c01dbdd98b1e12d7b2361d Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 7 Jul 2020 18:10:00 +0800 Subject: [PATCH] Add carrier config for NR timer reset KEY_NR_TIMERS_RESET_IF_NON_ENDC_AND_RRC_IDLE_BOOL: Whetherdevice reset all of NR timers when device camped on a network that haven't 5G capability and RRC currently in IDLE state. Bug: 160365713 Test: build pass. Change-Id: I9802b8712798054a85307e549fb665bc85166311 Merged-In: I9802b8712798054a85307e549fb665bc85166311 --- .../java/android/telephony/CarrierConfigManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b75f9a15f66f4..a605af4dbc342 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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);