am f327fd34: am 5a45dc96: am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev

* commit 'f327fd34c94781469e0219e27b91f25039cfb2cb':
  Add carrier config variable to hide preferred network type
This commit is contained in:
Amit Mahajan
2015-09-10 01:21:17 +00:00
committed by Android Git Automerger

View File

@@ -378,6 +378,12 @@ public class CarrierConfigManager {
*/
public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";
/**
* Determine whether preferred network type can be shown.
* @hide
*/
public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";
/**
* 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
@@ -490,6 +496,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);