From 22b7b5e3d7acf2dca58aca9b7156c89796de9359 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 23 Apr 2020 10:48:29 -0700 Subject: [PATCH] Remove constants for DisplayInfo logic from DcTracker Deprecate carrier configs for connected->not connected timer Replaced DCT events with displayinfo changed listener Test: atest NetworkTypeControllerTest, DcTrackerTest Test: manual verify timer and meteredness works as expected Bug: 154186364 Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7 Merged-In: I22a459e79f509f20c6b38386655c4b49315e3be7 --- .../android/telephony/CarrierConfigManager.java | 16 ---------------- .../android/internal/telephony/DctConstants.java | 9 ++++----- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d6f8a9897413c..e33552a098132 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3024,21 +3024,6 @@ public class CarrierConfigManager { */ public static final String KEY_5G_ICON_CONFIGURATION_STRING = "5g_icon_configuration_string"; - /** - * Timeout in seconds for displaying 5G icon, default value is 0 which means the timer is - * disabled. - * - * System UI will show the 5G icon and start a timer with the timeout from this config when the - * device connects to a 5G cell. System UI stops displaying 5G icon when both the device - * disconnects from 5G cell and the timer is expired. - * - * If 5G is reacquired during this timer, the timer is canceled and restarted when 5G is next - * lost. Allows us to momentarily lose 5G without blinking the icon. - * @hide - */ - public static final String KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT = - "5g_icon_display_grace_period_sec_int"; - /** * This configuration allows the system UI to determine how long to continue to display 5G icons * when the device switches between different 5G scenarios. @@ -4180,7 +4165,6 @@ 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.putInt(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 0); /* Default value is 1 hour. */ sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000); sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false); diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 18e25921555af..76fc4f7d05194 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -109,11 +109,10 @@ public class DctConstants { public static final int EVENT_DATA_SERVICE_BINDING_CHANGED = BASE + 49; public static final int EVENT_DEVICE_PROVISIONED_CHANGE = BASE + 50; public static final int EVENT_DATA_ENABLED_OVERRIDE_RULES_CHANGED = BASE + 51; - public static final int EVENT_SERVICE_STATE_CHANGED = BASE + 52; - public static final int EVENT_5G_TIMER_HYSTERESIS = BASE + 53; - public static final int EVENT_5G_TIMER_WATCHDOG = BASE + 54; - public static final int EVENT_CARRIER_CONFIG_CHANGED = BASE + 55; - public static final int EVENT_SIM_STATE_UPDATED = BASE + 56; + public static final int EVENT_TELEPHONY_DISPLAY_INFO_CHANGED = BASE + 52; + public static final int EVENT_NR_TIMER_WATCHDOG = BASE + 53; + public static final int EVENT_CARRIER_CONFIG_CHANGED = BASE + 54; + public static final int EVENT_SIM_STATE_UPDATED = BASE + 55; /***** Constants *****/