Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "User cannot reject a waiting call after a switch call fails" am: ffd2e964c1 am: 86df43feba

Browse Source 
Change-Id: Ia35d403cc7cfeaa75c627242ec05dac8d4620b55
This commit is contained in:
Automerger Merge Worker
2019-12-17 21:26:36 +00:00
parent b82174bc3a 86df43feba
commit c5fa3f6e33
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -43420,6 +43420,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";

9
telecomm/java/android/telecom/Connection.java
View File

@@ -694,6 +694,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.
* <p>
* 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.