diff options
| author | 2016-07-06 16:32:43 -0700 | |
|---|---|---|
| committer | 2016-07-08 15:14:42 -0700 | |
| commit | ee6e86b2bc9ab811500c30e26d8e07b3781acfaf (patch) | |
| tree | b81355ebd048e006a5e63c826afa3fb36b241dc8 | |
| parent | 7742a315fc0793e330beb14d538e9efca8e67c98 (diff) | |
Rename disable add call extra
Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.
Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 6 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 766e930649e9..441efb79f950 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -407,11 +407,11 @@ public abstract class Connection extends Conferenceable { /** * 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 */ - public static final String EXTRA_DISABLE_ADD_CALL_DURING_VIDEO_CALL = - "android.telecom.extra.DISABLE_ADD_CALL_DURING_VIDEO_CALL"; + public static final String EXTRA_DISABLE_ADD_CALL = + "android.telecom.extra.DISABLE_ADD_CALL"; /** * Connection event used to inform Telecom that it should play the on hold tone. This is used diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index a5e50aa1ee5d..9603662dd307 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -819,7 +819,9 @@ public class CarrierConfigManager { "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 = "allow_add_call_during_video_call"; |