diff options
| author | 2018-03-19 18:36:10 +0000 | |
|---|---|---|
| committer | 2018-03-19 18:36:10 +0000 | |
| commit | ffe1c2227188cf5fba9e7fb96cc2959ee90758ba (patch) | |
| tree | 3c66894fccb8c83929e6fd4125dab20886d670b4 | |
| parent | 1fa90bc5a4053b40869e9c438690a45b9f1ed68d (diff) | |
| parent | 7c8a877231998c5a8adf729248640a669d123fe5 (diff) | |
Merge "Rename handover failure constant per API review comments."
am: 7c8a877231
Change-Id: Ic3cd64d00f6c5a44acb9f6913fe728bd252fa99a
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | 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 070e87913fde..047a20e70aa9 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 |