Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b60e0bf4 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

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

am: 7e10bcff

Change-Id: Ide932c20b167bdfb9623cebd70d7732b53a80b34
parents 0fc003e6 7e10bcff

telecomm/java/android/telecom/Connection.java

+3 −3
Original line number Diff line number Diff line
@@ -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

telephony/java/android/telephony/CarrierConfigManager.java

+3 −1
Original line number Diff line number Diff line
@@ -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";