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

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

Merge "Fix issues associated with hold failure" 

am: df6e5604

Change-Id: I0c3ca2ef55a67b1f2c00f19635dcfd8ed0bbedea
parents 43827552 df6e5604

telecomm/java/android/telecom/Connection.java

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

    public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";



    /**

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

     * Not intended for use by the UI at this time.

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

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

     * @hide

     */

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



    /**

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

     * Connection into a conference has begun.