diff options
| author | Jack Yu <jackyu@google.com> | 2021-05-01 09:33:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-01 09:33:15 +0000 |
| commit | 259fa8266a544690cb4dc0e502324e288c526526 (patch) | |
| tree | e8fb0a44208b4046497f69a94147b7e043e8c3e8 | |
| parent | 70a00cb62232ca9335bae0170a91275a3dcebed5 (diff) | |
| parent | efa5a0e556f7ec4cc30de7bb1e078b28afb2493a (diff) | |
Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d am: efa5a0e556
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851
Change-Id: I55bcfc699e0891426421b56397a6a48f517b6e9f
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DctConstants.java | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7cef5052cbce..3ec0a110cdb7 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 f2f205018e4c..6fbde503c3a0 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 *****/ |