summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hall Liu <hallliu@google.com> 2017-02-15 22:56:31 +0000
committer android-build-merger <android-build-merger@google.com> 2017-02-15 22:56:31 +0000
commitc788f3e15ce6cf149e57537b5d16eef7d5d03f8d (patch)
treef2566d6011287e24721f3cc49f2c129be04445ca
parentb9382c23a8bb0cb3ad220272c3b63922aa0707d9 (diff)
parentb521143aa1e29566a8f849db4acbf75dcd763dbf (diff)
Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d56 am: 2bc24e252e am: 38f5001c10
am: b521143aa1 Change-Id: I416d7ad1a12a6b8ddb2ea2958356a487e7f10aef
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 96070b88a1a6..7964cf2c8346 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -317,6 +317,15 @@ public class TelecomManager {
public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
/**
+ * The number of milliseconds that Telecom should wait after disconnecting a call via the
+ * ACTION_NEW_OUTGOING_CALL broadcast, in order to wait for the app which cancelled the call
+ * to make a new one.
+ * @hide
+ */
+ public static final String EXTRA_NEW_OUTGOING_CALL_CANCEL_TIMEOUT =
+ "android.telecom.extra.NEW_OUTGOING_CALL_CANCEL_TIMEOUT";
+
+ /**
* A boolean meta-data value indicating whether an {@link InCallService} implements an
* in-call user interface. Dialer implementations (see {@link #getDefaultDialerPackage()}) which
* would also like to replace the in-call interface should set this meta-data to {@code true} in