summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-06-01 18:00:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-01 18:00:50 +0000
commit064fc83b81e215881c2ad22827741e6e9142f948 (patch)
tree1f93818af8baf0045ab763796549a7883ffa28a7 /telecomm
parent0ee2c1aef93987663968dbfd693cc5eda06c8244 (diff)
parent5cf2dde3f7b2003fa832f0657b8b675ce84d77f7 (diff)
downloadframeworks_base-064fc83b81e215881c2ad22827741e6e9142f948.zip
frameworks_base-064fc83b81e215881c2ad22827741e6e9142f948.tar.gz
frameworks_base-064fc83b81e215881c2ad22827741e6e9142f948.tar.bz2
Merge "Add ability to modify default dialer via ADB" into mnc-dev
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 4cf741d..07176b3 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -124,6 +124,16 @@ public class TelecomManager {
"android.telecom.action.CHANGE_DEFAULT_DIALER";
/**
+ * Privileged version of {@link #ACTION_CHANGE_DEFAULT_DIALER} that doesn't require
+ * confirmation from the user via the dialog.
+ *
+ * Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE}
+ * @hide
+ */
+ public static final String ACTION_CHANGE_DEFAULT_DIALER_PRIVILEGED =
+ "android.telecom.action.CHANGE_DEFAULT_DIALER_PRIVILEGED";
+
+ /**
* Activity action: Opens the settings screen where a user can enable and disable which
* {@link PhoneAccount}s are allows to make and receive calls. Because a user must
* explicitly enable an account before the system will use it, an app may want to send the