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

Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a am: a0df3496d3

Browse Source 
am: 4025ccb0a1

Change-Id: Ida23475584fb0324ce12af05af422230b170b1a4
This commit is contained in:
Jordan Liu
2017-10-17 21:36:11 +00:00
committed by android-build-merger
parent 63e3339ec9 4025ccb0a1
commit 2cdc98d7a6
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1594,6 +1594,18 @@ public class CarrierConfigManager {
public static final String KEY_DISABLE_CHARGE_INDICATION_BOOL =
"disable_charge_indication_bool";
/**
* Boolean indicating whether to skip the call forwarding (CF) fail-to-disable dialog.
* The logic used to determine whether we succeeded in disabling is carrier specific,
* so the dialog may not always be accurate.
* {@code false} - show CF fail-to-disable dialog.
* {@code true} - skip showing CF fail-to-disable dialog.
*
* @hide
*/
public static final String KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL =
"skip_cf_fail_to_disable_dialog_bool";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -1748,6 +1760,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);