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

Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I165eaa765fbcac7dc4030d7cfafecef3cc84d01c
This commit is contained in:
Sarah Chin
2021-02-02 23:36:27 +00:00
committed by Automerger Merge Worker
parent d2243be46a 5becb8f399
commit b9938fb47d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4124,6 +4124,13 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool"; public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_bool";
/**
* Indicates temporarily unmetered mobile data is supported by the carrier.
* @hide
*/
public static final String KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL =
"network_temp_not_metered_supported_bool";
/** The default value for every variable. */ /** The default value for every variable. */
private final static PersistableBundle sDefaults; private final static PersistableBundle sDefaults;
@@ -4673,6 +4680,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, ""); sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false); sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false); sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0); sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);
} }