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

Commit ffd2e964 authored by Tyler Gunn's avatar Tyler Gunn Committed by Gerrit Code Review
Browse files

Merge "User cannot reject a waiting call after a switch call fails"

parents 23019528 cb8fa744

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43420,6 +43420,7 @@ package android.telecom { 
    field public static final String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";

    field public static final String EVENT_CALL_REMOTELY_UNHELD = "android.telecom.event.CALL_REMOTELY_UNHELD";

    field public static final String EVENT_CALL_SWITCH_FAILED = "android.telecom.event.CALL_SWITCH_FAILED";

    field public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";

    field public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START";

    field public static final String EVENT_ON_HOLD_TONE_END = "android.telecom.event.ON_HOLD_TONE_END";

telecomm/java/android/telecom/Connection.java

+9 −0
Original line number Diff line number Diff line
@@ -694,6 +694,15 @@ public abstract class Connection extends Conferenceable { 
     */

    public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED";



    /**

     * Connection event used to inform Telecom when a switch operation on a call has failed.

     * <p>

     * Sent via {@link #sendConnectionEvent(String, Bundle)}.  The {@link Bundle} parameter is

     * expected to be null when this connection event is used.

     */

    public static final String EVENT_CALL_SWITCH_FAILED =

            "android.telecom.event.CALL_SWITCH_FAILED";



    /**

     * Connection event used to inform {@link InCallService}s when the process of merging a

     * Connection into a conference has begun.