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

Commit 3b76cb76 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge \"Add EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev 

am: a3d4baf4

Change-Id: I56f5854a39325671b1854ce453a416eb24b9c8a8
parents bd7cabf0 a3d4baf4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36315,6 +36315,7 @@ package android.telecom { 
    field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800

    field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2

    field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8

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

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39164,6 +39164,7 @@ package android.telecom { 
    field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800

    field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2

    field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8

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

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36393,6 +36393,7 @@ package android.telecom { 
    field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800

    field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2

    field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8

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

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

telecomm/java/android/telecom/Connection.java

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

    public static final String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";



    /**

     * Connection event used to inform {@link InCallService}s when the merging of two calls has

     * failed. The User Interface should use this message to inform the user of the error.

     */

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



    // Flag controlling whether PII is emitted into the logs

    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);