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

Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev

Browse Source
This commit is contained in:
Brad Ebinger
2016-06-13 17:39:18 +00:00
committed by Android (Google) Code Review
parent 4a119bc588 2c1c164578
commit a3d4baf43b
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,6 +396,12 @@ public abstract class Connection extends Conferenceable {
*/
public static final String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";
/**
* Connection event used to inform {@link InCallService}s when the merging of two calls has
* failed. The User Interface should use this message to inform the user of the error.
*/
public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);