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

Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev

Browse Source
This commit is contained in:
Adam Seaton
2016-08-23 20:07:26 +00:00
committed by Android (Google) Code Review
parent e1f32de996 d697c5dc9b
commit 09c77dd2b1
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,6 +461,32 @@ 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 {@link InCallService}s when a call has been put on hold by
* the remote party.
* <p>
* This is different than the {@link Connection#STATE_HOLDING} state which indicates that the
* call is being held locally on the device. When a capable {@link ConnectionService} receives
* signalling to indicate that the remote party has put the call on hold, it can send this
* connection event.
* @hide
*/
public static final String EVENT_CALL_REMOTELY_HELD =
"android.telecom.event.CALL_REMOTELY_HELD";
/**
* Connection event used to inform {@link InCallService}s when a call which was remotely held
* (see {@link #EVENT_CALL_REMOTELY_HELD}) has been un-held by the remote party.
* <p>
* This is different than the {@link Connection#STATE_HOLDING} state which indicates that the
* call is being held locally on the device. When a capable {@link ConnectionService} receives
* signalling to indicate that the remote party has taken the call off hold, it can send this
* connection event.
* @hide
*/
public static final String EVENT_CALL_REMOTELY_UNHELD =
"android.telecom.event.CALL_REMOTELY_UNHELD";
// Flag controlling whether PII is emitted into the logs // Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);