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

Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev

Browse Source 
am: b68601d247

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

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
This commit is contained in:
Sanket Padawe
2016-06-02 23:15:57 +00:00
committed by android-build-merger
parent 13f802dc01 b68601d247
commit 701cd3fe15
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,6 +581,20 @@ public class CarrierConfigManager {
/** @hide */ /** @hide */
public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int"; public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int";
/**
* 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
@@ -785,6 +799,8 @@ public class CarrierConfigManager {
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); 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);