From 5c60d71efbad23feff2416f4c8065ef1155c5fe5 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Fri, 16 Mar 2018 09:53:44 -0700 Subject: Rename handover failure constant per API review comments. Expanding EMERG to EMERGENCY. Test: Build code Bug: 74831393 Change-Id: Ib7e6bea84e25b1e1a2ddb154c7ed62f1084a7596 --- 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 ca505ebd3ed6..b2d2bf23aec9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39194,7 +39194,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 73243d2ebada..1c0e260bef5f 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 -- cgit v1.2.3-59-g8ed1b