diff options
author | Amit Mahajan <amitmahajan@google.com> | 2015-09-10 01:04:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-10 01:04:43 +0000 |
commit | 5a45dc960b42eae66661665ff9a6bcb7e4a02c16 (patch) | |
tree | 45b8111bd6f42c284c020dfbb8f6c82439788392 /telephony | |
parent | 847bdf0093f649a169940fb93249e2beb67f6b45 (diff) | |
parent | 0018323c07d119fde7260d66f60dd9987c7b74ea (diff) | |
download | frameworks_base-5a45dc960b42eae66661665ff9a6bcb7e4a02c16.zip frameworks_base-5a45dc960b42eae66661665ff9a6bcb7e4a02c16.tar.gz frameworks_base-5a45dc960b42eae66661665ff9a6bcb7e4a02c16.tar.bz2 |
am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev
* commit '0018323c07d119fde7260d66f60dd9987c7b74ea':
Add carrier config variable to hide preferred network type
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 135a97a..4a04cf1 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -379,6 +379,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 * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more @@ -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); |