summaryrefslogtreecommitdiffstats
path: root/core/java/android
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 /core/java/android
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 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4e13758..fff355b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -574,7 +574,22 @@ public final class Settings {
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_MANAGE_OVERLAY_PERMISSION =
- "android.settings.MANAGE_OVERLAY_PERMISSION";
+ "android.settings.action.MANAGE_OVERLAY_PERMISSION";
+
+ /**
+ * Activity Action: Show settings to toggle apps' capablity to
+ * to read/write system settings.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you
+ * safeguard against this.
+ * <p>
+ * Input: Nothing.
+ * <p>
+ * Output: Nothing.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_MANAGE_WRITE_SETTINGS =
+ "android.settings.action.MANAGE_WRITE_SETTINGS";
/**
* Activity Action: Show screen of details about a particular application.