summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-07-08 00:31:01 +0100
committerBilly Lau <billylau@google.com>2015-07-12 22:41:00 +0100
commit22b3f4cb15207239e203d5ec8b72ec6bc90fef35 (patch)
treef31bf89fd6b9e468571592fd366c0b66f4306a90 /api
parent4ccf69e1191244ee104edd74843fc7ae391c5270 (diff)
downloadframeworks_base-22b3f4cb15207239e203d5ec8b72ec6bc90fef35.zip
frameworks_base-22b3f4cb15207239e203d5ec8b72ec6bc90fef35.tar.gz
frameworks_base-22b3f4cb15207239e203d5ec8b72ec6bc90fef35.tar.bz2
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also allowed backwards compatibility with pre23 flag. Also made sure that this permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as that breaks a lot of gmscore stuff. Introduced new action to manage write system settings as a new API and renamed the string that describes the managing of overlay permission. Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
-rw-r--r--api/system-current.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index af95867..0af9117 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26405,7 +26405,8 @@ 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_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
+ field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
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";
diff --git a/api/system-current.txt b/api/system-current.txt
index 9fce166..dea1063 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -28461,7 +28461,8 @@ 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_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
+ field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
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";