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

Merge "Rename disable add call extra" into nyc-mr1-dev

Browse Source
This commit is contained in:
Hall Liu
2016-07-09 01:03:19 +00:00
committed by Android (Google) Code Review
parent 8b31db3621 ee6e86b2bc
commit 7e10bcffc5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Connection.java
View File

@@ -407,11 +407,11 @@ public abstract class Connection extends Conferenceable {
/** /**
* Boolean connection extra key on a {@link Connection} which indicates that adding an * Boolean connection extra key on a {@link Connection} which indicates that adding an
* additional call is disallowed when there is a video call in progress. * additional call is disallowed.
* @hide * @hide
*/ */
public static final String EXTRA_DISABLE_ADD_CALL_DURING_VIDEO_CALL = public static final String EXTRA_DISABLE_ADD_CALL =
"android.telecom.extra.DISABLE_ADD_CALL_DURING_VIDEO_CALL"; "android.telecom.extra.DISABLE_ADD_CALL";
/** /**
* Connection event used to inform Telecom that it should play the on hold tone. This is used * Connection event used to inform Telecom that it should play the on hold tone. This is used

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

@@ -819,7 +819,9 @@ public class CarrierConfigManager {
"allow_merge_wifi_calls_when_vowifi_off_bool"; "allow_merge_wifi_calls_when_vowifi_off_bool";
/** /**
* When true, indicates that adding a call is disabled when there is an ongoing video 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
* turned off.
*/ */
public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL =
"allow_add_call_during_video_call"; "allow_add_call_during_video_call";