diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2015-09-09 17:22:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-09 17:22:28 +0000 |
| commit | 95198ee9ce374582e71b5a29e740e97b7b7b198b (patch) | |
| tree | 9fe256fd0aa9aea74b5bc84e329dcc1764ff64b5 /telephony | |
| parent | 6544d5a2a7089b6e76c0548cd9f63f9400ce1082 (diff) | |
| parent | ebd1465885af2a1de5a885dac791ee6184f85d7f (diff) | |
| download | frameworks_base-95198ee9ce374582e71b5a29e740e97b7b7b198b.zip frameworks_base-95198ee9ce374582e71b5a29e740e97b7b7b198b.tar.gz frameworks_base-95198ee9ce374582e71b5a29e740e97b7b7b198b.tar.bz2 | |
am ebd14658: Merge "Add carrier config variable to hide ims apn" into mnc-dr-dev
* commit 'ebd1465885af2a1de5a885dac791ee6184f85d7f':
Add carrier config variable to hide ims apn
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 8889ca9..135a97a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -373,6 +373,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 * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more @@ -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); |