summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2017-02-16 01:09:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-16 01:09:38 +0000
commit4d3435637fb929d04c3805613a378becdd45f02e (patch)
tree430cfc6051455a170273f6166f1348cfa39aea3d
parent38f1b6dbc97435f1227f15b4b7dca6c9bd3cc343 (diff)
parent67c708bed82f06f3c261ec7ebc5d321918de143e (diff)
downloadbase-4d3435637fb929d04c3805613a378becdd45f02e.tar.gz
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
-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 f12886afa6e5..aa327698a24e 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -314,6 +314,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