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

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev

Browse Source 
am: 95f4f14e0b

Change-Id: If762616920b266064cd1ee5520d5778ebb1475a7
This commit is contained in:
Tyler Gunn
2017-05-25 19:44:32 +00:00
committed by android-build-merger
parent e406d52628 95f4f14e0b
commit 0aea0d2c53
3 changed files with 80 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -525,6 +525,26 @@ public abstract class Connection extends Conferenceable {
*/
public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";
/**
* Connection event used to inform {@link InCallService}s when the process of merging a
* Connection into a conference has begun.
* <p>
* 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_MERGE_START = "android.telecom.event.MERGE_START";
/**
* Connection event used to inform {@link InCallService}s when the process of merging a
* Connection into a conference has completed.
* <p>
* 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_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";
/**
* Connection event used to inform {@link InCallService}s when a call has been put on hold by
* the remote party.