summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-06-30 09:05:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-30 09:05:34 +0000
commitf62f4c94a36f5c2f7ad3c70316dc585ea3fd721a (patch)
treebdbb639a54a06230eefc3679ac08f17bcb222ba0 /api/current.txt
parentfef8cbd6a643a621a97f8e5616977e1fb65d9a5f (diff)
parentcbe540f94691b595ca2eaede2871d885c38a845c (diff)
downloadframeworks_base-f62f4c94a36f5c2f7ad3c70316dc585ea3fd721a.zip
frameworks_base-f62f4c94a36f5c2f7ad3c70316dc585ea3fd721a.tar.gz
frameworks_base-f62f4c94a36f5c2f7ad3c70316dc585ea3fd721a.tar.bz2
Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 2802062..3cb38c4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26424,6 +26424,7 @@ package android.provider {
field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
+ field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.MANAGE_OVERLAY_PERMISSION";
field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";
field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";