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

am 59f3c342: am 6611cff4: am d9efca99: Merge "Support uneditable enhanced 4g lte mode config" into mnc-dr-dev

Browse Source 
* commit '59f3c3429bf61ff4eb6f5d16abba01cb58cc5ee9':
  Support uneditable enhanced 4g lte mode config
This commit is contained in:
Pavel Zhamaitsiak
2015-08-29 23:09:57 +00:00
committed by Android Git Automerger
parent 6795377854 59f3c3429b
commit 07d04774da
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,6 +356,12 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool"; public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";
/**
* Determine whether user can toggle Enhanced 4G LTE Mode in Settings.
* @hide
*/
public static final String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";
/** /**
* 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
@@ -456,6 +462,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false); sDefaults.putBoolean(KEY_FORCE_HOME_NETWORK_BOOL, false);
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0); sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
// MMS defaults // MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);