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

Merge "Fix issues associated with hold failure"

Browse Source 
am: df6e5604f3

Change-Id: I0c3ca2ef55a67b1f2c00f19635dcfd8ed0bbedea
This commit is contained in:
Hall Liu
2019-03-13 14:32:28 -07:00
committed by android-build-merger
parent 4382755210 df6e5604f3
commit 9fefce6df5
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,6 +554,15 @@ public abstract class Connection extends Conferenceable {
*/ */
public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED"; public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";
/**
* Connection event used to inform Telecom when a hold operation on a call has failed.
* Not intended for use by the UI at this time.
* Sent via {@link #sendConnectionEvent(String, Bundle)}. The {@link Bundle} parameter is
* expected to be null when this connection event is used.
* @hide
*/
public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED";
/** /**
* Connection event used to inform {@link InCallService}s when the process of merging a * Connection event used to inform {@link InCallService}s when the process of merging a
* Connection into a conference has begun. * Connection into a conference has begun.