From 0ab380166d875021ccbf83636b1cca2d1fdd8e55 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 19 Mar 2018 20:14:10 +0000 Subject: [PATCH] Rename handover failure constant per API review comments. Expanding EMERG to EMERGENCY. Test: Build code Bug: 74831393 Merged-In: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e Change-Id: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e (cherry picked from commit a4ef504bdc3044920d4996b93c30751a2fbce217) --- api/current.txt | 2 +- telecomm/java/android/telecom/Call.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 6a9f00e46b07f..f554c700167ab 100644 --- a/api/current.txt +++ b/api/current.txt @@ -41422,7 +41422,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 } diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 73243d2ebadaa..1c0e260bef5f1 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -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