Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851

Change-Id: Ia724ce769e036348a35d2166dc9fa0a5bb32ab8a
This commit is contained in:
Jack Yu
2021-05-01 09:15:16 +00:00
committed by Automerger Merge Worker
parent 0e1b7e11ec e4df5d375d
commit efa5a0e556
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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);
}
/**

1
telephony/java/com/android/internal/telephony/DctConstants.java
View File

@@ -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 *****/