summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2019-03-13 14:45:42 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-13 14:45:42 -0700
commitc3557eb6397a6baed172f90fa59d22e4e848f8e7 (patch)
tree0f479ef7c5268e6b78e9e1cf7de71c897c0c42fd
parentbcf1be1c918e5b967eccc68d649bb5a6dc652752 (diff)
parent9fefce6df535952936b7e1651b728c25c6195c86 (diff)
Merge "Fix issues associated with hold failure" am: df6e5604f3
am: 9fefce6df5 Change-Id: Ib736c4b26fac7262727873cdccd510927226f8f9
-rw-r--r--telecomm/java/android/telecom/Connection.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index bd0d4ae27800..5f0fa4963322 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -555,6 +555,15 @@ 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 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 into a conference has begun.
* <p>