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

Add ability to add existing connection AND set parent at the same time.

Browse Source 
This is useful for IMS conferences where we want to add a connection and
set it as a child of a conference at the same time.

Test: Manual
Bug: 37581781
Change-Id: Id09c8296ffe18893c5642d403c6a69ad6c9765e2
This commit is contained in:
Tyler Gunn
2017-05-09 14:34:57 -07:00
parent e943a3cbe7
commit 78da7816da
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

@@ -522,6 +522,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.