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

Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev

Browse Source 
am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
This commit is contained in:
Sanket Padawe
2016-06-03 00:44:49 +00:00
committed by android-build-merger
parent a84b5d0ebd 1a6b6fc266
commit a255d5de80
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,6 +600,19 @@ public class CarrierConfigManager {
public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING =
"wfc_emergency_address_carrier_app_string"; "wfc_emergency_address_carrier_app_string";
/**
* Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app.
* @hide
*/
public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";
/**
* String to identify carrier name in CarrierConfig app. This string is used only if
* #KEY_CARRIER_NAME_OVERRIDE_BOOL is true
* @hide
*/
public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";
/** /**
* If this is true, the SIM card (through Customer Service Profile EF file) will be able to * If this is true, the SIM card (through Customer Service Profile EF file) will be able to
* prevent manual operator selection. If false, this SIM setting will be ignored and manual * prevent manual operator selection. If false, this SIM setting will be ignored and manual
@@ -813,6 +826,8 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0); sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0);
sDefaults.putString(KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING, ""); sDefaults.putString(KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING, "");
sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false); sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
// MMS defaults // MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);