From c8cf1b02a31e62bf620e6605337e5e0b3e1e508b Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 20 Apr 2021 13:29:54 -0700 Subject: [PATCH] Unthrottle data retry in some conditions 1. Moved the APM unthrottle logic to DataThrottler. 2. Added conditional unthrottle when TAC changes. Fix: 169648447 Test: Manual Change-Id: I1a7e413015ccdff3d9358cc85605325a4bff3b33 --- .../java/android/telephony/CarrierConfigManager.java | 9 +++++++++ .../com/android/internal/telephony/DctConstants.java | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 8b9fc0fbf5b21..18936c2f84570 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4929,6 +4929,14 @@ public class CarrierConfigManager { public static final String KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL = "display_no_data_notification_on_permanent_failure_bool"; + /** + * Determine whether unthrottle data retry when tracking area code (TAC/LAC) from cell changes + * + * @hide + */ + public static final String KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL = + "unthrottle_data_retry_when_tac_changes_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -5508,6 +5516,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true); sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, ""); sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false); + sDefaults.putBoolean(KEY_UNTHROTTLE_DATA_RETRY_WHEN_TAC_CHANGES_BOOL, false); } /** diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 1e5d59872208e..409c838cb3e3c 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -114,7 +114,6 @@ public class DctConstants { public static final int EVENT_CARRIER_CONFIG_CHANGED = BASE + 54; public static final int EVENT_SIM_STATE_UPDATED = BASE + 55; public static final int EVENT_APN_UNTHROTTLED = BASE + 56; - public static final int EVENT_AIRPLANE_MODE_CHANGED = BASE + 57; /***** Constants *****/