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

Commit e4330eaa authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Rename handover failure constant per API review comments." am: 7c8a8772 

am: ffe1c222

Change-Id: Icae03afa86e7b660e9f52df252d2e3c961762be8
parents ccadbf77 ffe1c222

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -41408,7 +41408,7 @@ package android.telecom { 
    method public void onVideoCallChanged(android.telecom.Call, android.telecom.InCallService.VideoCall);

    field public static final int HANDOVER_FAILURE_DEST_APP_REJECTED = 1; // 0x1

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

    field public static final int HANDOVER_FAILURE_ONGOING_EMERG_CALL = 4; // 0x4

    field public static final int HANDOVER_FAILURE_ONGOING_EMERGENCY_CALL = 4; // 0x4

    field public static final int HANDOVER_FAILURE_UNKNOWN = 5; // 0x5

    field public static final int HANDOVER_FAILURE_USER_REJECTED = 3; // 0x3

  }

telecomm/java/android/telecom/Call.java

+2 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ public final class Call { 
         */

        @IntDef(prefix = { "HANDOVER_" },

                value = {HANDOVER_FAILURE_DEST_APP_REJECTED, HANDOVER_FAILURE_NOT_SUPPORTED,

                HANDOVER_FAILURE_USER_REJECTED, HANDOVER_FAILURE_ONGOING_EMERG_CALL,

                HANDOVER_FAILURE_USER_REJECTED, HANDOVER_FAILURE_ONGOING_EMERGENCY_CALL,

                HANDOVER_FAILURE_UNKNOWN})

        @Retention(RetentionPolicy.SOURCE)

        public @interface HandoverFailureErrors {}
@@ -939,7 +939,7 @@ public final class Call { 
         * For more information on call handovers, see

         * {@link #handoverTo(PhoneAccountHandle, int, Bundle)}.

         */

        public static final int HANDOVER_FAILURE_ONGOING_EMERG_CALL = 4;

        public static final int HANDOVER_FAILURE_ONGOING_EMERGENCY_CALL = 4;



        /**

         * Handover failure reason returned via {@link #onHandoverFailed(Call, int)} when a handover