diff options
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index b719811791ce..5d56461e894e 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -840,6 +840,14 @@ public abstract class Connection extends Conferenceable { "android.telecom.extra.IS_DEVICE_TO_DEVICE_COMMUNICATION_AVAILABLE"; /** + * Boolean connection extra key set on a {@link Connection} to indicate that swapping + * the call is not allowed. + * @hide + */ + public static final String EXTRA_DISABLE_SWAP_CALL = + "android.telecom.extra.DISABLE_SWAP_CALL"; + + /** * Connection event used to inform Telecom that it should play the on hold tone. This is used * to play a tone when the peer puts the current call on hold. Sent to Telecom via * {@link #sendConnectionEvent(String, Bundle)}. diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index fed437fc3347..0dfbc22df71f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2440,6 +2440,13 @@ public class CarrierConfigManager { "allow_hold_video_call_bool"; /** + * When true, indicates that concurrent call is allowed when there is an ongoing video call. + * @hide + */ + public static final String KEY_ALLOW_CONCURRENT_CALL_DURING_VIDEO_CALL_BOOL = + "allow_concurrent_call_during_video_call"; + + /** * When true, indicates that the HD audio icon in the in-call screen should not be shown for * VoWifi calls. * @hide @@ -5491,6 +5498,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL, true); sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true); sDefaults.putBoolean(KEY_ALLOW_HOLD_VIDEO_CALL_BOOL, true); + sDefaults.putBoolean(KEY_ALLOW_CONCURRENT_CALL_DURING_VIDEO_CALL_BOOL, true); sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true); sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true); sDefaults.putBoolean(KEY_GSM_CDMA_CALLS_CAN_BE_HD_AUDIO, false); |