From 86c11c1e69c9ae914408da81159ea8265539cce5 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Mon, 1 Mar 2021 10:15:45 -0800 Subject: [PATCH 1/2] Unthrottle all APNs on APM Test: Toggle APM and check for unthrottle with logs Bug: 176440863 Merged-In: I8ecc7a61a181df46f7283196cfaf2d28bbddb50f Change-Id: I8ecc7a61a181df46f7283196cfaf2d28bbddb50f (cherry picked from commit 781d41ad21a19e04f991047be96e850b0962aa76) --- telephony/java/com/android/internal/telephony/DctConstants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 6fbde503c3a06..f2f205018e4c2 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -114,6 +114,7 @@ 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 *****/ From e740257a4a85017b9f4e77eca732dd0a60ac7f40 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 20 Apr 2021 13:29:54 -0700 Subject: [PATCH 2/2] 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 Merged-In: I1a7e413015ccdff3d9358cc85605325a4bff3b33 Change-Id: I1a7e413015ccdff3d9358cc85605325a4bff3b33 (cherry picked from commit c8cf1b02a31e62bf620e6605337e5e0b3e1e508b) --- .../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 210e4a5e17cad..dd474f02a2ed1 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4367,6 +4367,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; @@ -4934,6 +4942,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true); sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false); 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 f2f205018e4c2..6fbde503c3a06 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 *****/