From cb8fa7440e0bb1bd80603561d45ff621653b7aa1 Mon Sep 17 00:00:00 2001 From: Masaho Nishikawa Date: Thu, 7 Nov 2019 14:41:21 +0900 Subject: [PATCH] User cannot reject a waiting call after a switch call fails Add new connection event to indicate switch failure. Test: Manual - Verify that incoming call can be rejected after switch call is failed. Bug: 143918738 Change-Id: Ib38ceb3cb72ce946c071a8ec9748a1c81ca58808 --- api/current.txt | 1 + telecomm/java/android/telecom/Connection.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/api/current.txt b/api/current.txt index 4ba4fbee7b159..1fe7e4f7c63e2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -43381,6 +43381,7 @@ package android.telecom { field public static final String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED"; field public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD"; field public static final String EVENT_CALL_REMOTELY_UNHELD = "android.telecom.event.CALL_REMOTELY_UNHELD"; + field public static final String EVENT_CALL_SWITCH_FAILED = "android.telecom.event.CALL_SWITCH_FAILED"; field public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE"; field public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START"; field public static final String EVENT_ON_HOLD_TONE_END = "android.telecom.event.ON_HOLD_TONE_END"; diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index e2f5d0bba0b0a..757030e29ca8e 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -613,6 +613,15 @@ public abstract class Connection extends Conferenceable { */ public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED"; + /** + * Connection event used to inform Telecom when a switch operation on a call has failed. + *

+ * Sent via {@link #sendConnectionEvent(String, Bundle)}. The {@link Bundle} parameter is + * expected to be null when this connection event is used. + */ + public static final String EVENT_CALL_SWITCH_FAILED = + "android.telecom.event.CALL_SWITCH_FAILED"; + /** * Connection event used to inform {@link InCallService}s when the process of merging a * Connection into a conference has begun.