summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bryce Lee <brycelee@google.com> 2015-09-26 06:55:32 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-26 06:55:32 +0000
commit18b76bf6755b4e3469b17f6f898a40bb1fe70a63 (patch)
tree5785e629368cb91aa72fbb972f2c4c25b7364b00
parent979a22eaf9c62637c02ebd6f92ef6ea2888aa5be (diff)
parent861559d31f61554cf79768d08b15be57b9a77a66 (diff)
am 861559d3: am 24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
* commit '861559d31f61554cf79768d08b15be57b9a77a66': Add additional broadcast for when a phone account is unregistered.
-rw-r--r--api/system-current.txt1
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java9
2 files changed, 10 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index c5ca20bb5b54..1e7b94e883e4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32714,6 +32714,7 @@ package android.telecom {
field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";
+ field public static final java.lang.String ACTION_PHONE_ACCOUNT_UNREGISTERED = "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED";
field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION";
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 8779462e073e..b07b018f5a19 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -116,6 +116,15 @@ public class TelecomManager {
"android.telecom.action.PHONE_ACCOUNT_REGISTERED";
/**
+ * The {@link android.content.Intent} action used indicate that a phone account was
+ * just unregistered.
+ * @hide
+ */
+ @SystemApi
+ public static final String ACTION_PHONE_ACCOUNT_UNREGISTERED =
+ "android.telecom.action.PHONE_ACCOUNT_UNREGISTERED";
+
+ /**
* Activity action: Shows a dialog asking the user whether or not they want to replace the
* current default Dialer with the one specified in
* {@link #EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME}.