am 63d94e4c: am 95198ee9: am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev

* commit '63d94e4c3be9190554ed51f2b00eb764707fd848':
  Add carrier config variable to hide ims apn
This commit is contained in:
Vineeta Srivastava
2015-09-09 17:40:34 +00:00
committed by Android Git Automerger

View File

@@ -372,6 +372,12 @@ public class CarrierConfigManager {
*/
public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";
/**
* Determine whether IMS apn can be shown.
* @hide
*/
public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_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
@@ -483,6 +489,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
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);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);