From 2c1c16457836549eb8c78bf92a9f545058f996e5 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Fri, 27 May 2016 15:58:10 -0700 Subject: [PATCH] Add EVENT_CALL_MERGE_FAILED Connection Event Currently, if a call merge failure occurs, we can not try again because the merge button "gets stuck". This change adds a new Connection Event that notifies the InCall UI to enable the merge button so that the user can try again. Bug: 28847375 Change-Id: I376f6ee446e135577a54aa36ff1dfc77af87261a --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + telecomm/java/android/telecom/Connection.java | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/api/current.txt b/api/current.txt index 01aa843252f23..3b896a7bc1fc9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36318,6 +36318,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"; diff --git a/api/system-current.txt b/api/system-current.txt index c18b916dcdfa6..90dac041fc1ba 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -39165,6 +39165,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 7de82b32113a8..c7d0b077e786d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -36396,6 +36396,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"; diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index a5e3c4612a5d5..20e1715a88279 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -392,6 +392,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);