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

Merge "Wifi: Introduce a configuration parameter to disable WiFi in ECBM" into nyc-dev am: 951fe29

Browse Source 
am: 7299ce9

* commit '7299ce924f8c0cc166af74429766c204001f5d5f':
  Wifi: Introduce a configuration parameter to disable WiFi in ECBM

Change-Id: I23779849aa8bbe7627c546e8f3895d065ece83a3
This commit is contained in:
Robert Greenwalt
2016-04-18 16:38:51 +00:00
committed by android-build-merger
parent df4d50c0ae 7299ce924f
commit 60f0078dc2
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

@@ -547,6 +547,13 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_EDITABLE_WFC_MODE_BOOL = "editable_wfc_mode_bool"; public static final String KEY_EDITABLE_WFC_MODE_BOOL = "editable_wfc_mode_bool";
/**
* Flag to indicate if Wi-Fi needs to be disabled in ECBM
* @hide
**/
public static final String
KEY_CONFIG_WIFI_DISABLE_IN_ECBM = "config_wifi_disable_in_ecbm";
/** /**
* List operator-specific error codes and indices of corresponding error strings in * List operator-specific error codes and indices of corresponding error strings in
* wfcOperatorErrorAlertMessages and wfcOperatorErrorNotificationMessages. * wfcOperatorErrorAlertMessages and wfcOperatorErrorNotificationMessages.
@@ -755,6 +762,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null); sDefaults.putStringArray(KEY_WFC_OPERATOR_ERROR_CODES_STRING_ARRAY, null);
sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0); sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0);
sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0); sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0);
sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
// MMS defaults // MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);