summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-07-20 17:57:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-20 17:57:30 +0000
commit072e04a7f1a167dc653b5bcca4876fecfdb4f6be (patch)
tree8b4616c3c5a33b64c5fef6582b2aab348ff0366a /core/java
parent71780e79846d0ccc2aef2214041657410a8a14c2 (diff)
parent24b9c8314bf67637daf0d3b28440e0d5f08502c2 (diff)
downloadframeworks_base-072e04a7f1a167dc653b5bcca4876fecfdb4f6be.zip
frameworks_base-072e04a7f1a167dc653b5bcca4876fecfdb4f6be.tar.gz
frameworks_base-072e04a7f1a167dc653b5bcca4876fecfdb4f6be.tar.bz2
Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/AppOpsManager.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 08e1696..976830f 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -325,6 +325,12 @@ public class AppOpsManager {
/** Write external storage. */
public static final String OPSTR_WRITE_EXTERNAL_STORAGE
= "android:write_external_storage";
+ /** Required to draw on top of other apps. */
+ public static final String OPSTR_SYSTEM_ALERT_WINDOW
+ = "android:system_alert_window";
+ /** Required to write/modify/update system settingss. */
+ public static final String OPSTR_WRITE_SETTINGS
+ = "android:write_settings";
/**
* This maps each operation to the operation that serves as the
@@ -427,8 +433,8 @@ public class AppOpsManager {
OPSTR_SEND_SMS,
null,
null,
- null,
- null,
+ OPSTR_WRITE_SETTINGS,
+ OPSTR_SYSTEM_ALERT_WINDOW,
null,
OPSTR_CAMERA,
OPSTR_RECORD_AUDIO,