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

Merge "Add CarrierConfig to remove hold during Ims Calls" into nyc-mr1-dev

Browse Source
This commit is contained in:
Brad Ebinger
2016-07-21 18:40:42 +00:00
committed by Android (Google) Code Review
parent 736a5af504 c8601013d5
commit dee7dffb5d
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

@@ -845,6 +845,12 @@ public class CarrierConfigManager {
public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL =
"allow_merge_wifi_calls_when_vowifi_off_bool";
/**
* Flag indicating whether the carrier supports the Hold command while in an IMS call.
* @hide
*/
public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";
/**
* When true, indicates that adding a call is disabled when there is an ongoing video call
* or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
@@ -891,6 +897,7 @@ public class CarrierConfigManager {
static {
sDefaults = new PersistableBundle();
sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);
sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);