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

am da9fb3cc: am 51e8df2e: am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

Browse Source 
* commit 'da9fb3ccefc153e97ca93479e3f3739058af0313':
  Add carrier config variable to hide merge call button
This commit is contained in:
Tyler Gunn
2015-08-20 18:52:03 +00:00
committed by Android Git Automerger
parent a578ac8886 da9fb3ccef
commit bbd854e229
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,6 +349,13 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int"; public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";
/**
* Determines whether conference calls are supported by a carrier. When {@code true},
* conference calling is supported, {@code false otherwise}.
* @hide
*/
public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_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
@@ -448,6 +455,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);
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);
// MMS defaults // MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);