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

Commit 91600bc2 authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Add disconnect failed connection event" into main

parents 4b69e790 48551d55

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44103,6 +44103,7 @@ package android.telecom { 
    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 @FlaggedApi("com.android.server.telecom.flags.revert_disconnecting_during_merge") public static final String EVENT_DISCONNECT_FAILED = "android.telecom.event.DISCONNECT_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
@@ -948,6 +948,15 @@ public abstract class Connection extends Conferenceable { 
     */

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



    /**

     * Connection event used to inform Telecom when a disconnect request fails during a call merge.

     * <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_REVERT_DISCONNECTING_DURING_MERGE)

    public static final String EVENT_DISCONNECT_FAILED = "android.telecom.event.DISCONNECT_FAILED";



    /**

     * Connection event used to inform {@link InCallService}s when a call has been put on hold by

     * the remote party.