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

Commit 61c370b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DSDA: Handle call resume failure" into main

parents 61977132 96687896

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44050,6 +44050,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 @FlaggedApi("com.android.server.telecom.flags.call_sequencing_call_resume_failed") public static final String EVENT_CALL_RESUME_FAILED = "android.telecom.event.CALL_RESUME_FAILED";

    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";

telecomm/java/android/telecom/Connection.java

+10 −0
Original line number Diff line number Diff line
@@ -911,6 +911,16 @@ 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 resume 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.

     */

    @FlaggedApi(Flags.FLAG_CALL_SEQUENCING_CALL_RESUME_FAILED)

    public static final String EVENT_CALL_RESUME_FAILED =

            "android.telecom.event.CALL_RESUME_FAILED";



    /**

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

     * <p>