Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev

Browse Source 
* commit 'dd0602e89daf6c458674efbcf01a5e0521f3c381':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
This commit is contained in:
Billy Lau
2015-07-20 18:43:56 +00:00
committed by Android Git Automerger
parent f14e4435e0 dd0602e89d
commit e4bcf4803b
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -3863,12 +3863,14 @@ package android.app {
field public static final java.lang.String OPSTR_RECEIVE_WAP_PUSH = "android:receive_wap_push";
field public static final java.lang.String OPSTR_RECORD_AUDIO = "android:record_audio";
field public static final java.lang.String OPSTR_SEND_SMS = "android:send_sms";
field public static final java.lang.String OPSTR_SYSTEM_ALERT_WINDOW = "android:system_alert_window";
field public static final java.lang.String OPSTR_USE_FINGERPRINT = "android:use_fingerprint";
field public static final java.lang.String OPSTR_USE_SIP = "android:use_sip";
field public static final java.lang.String OPSTR_WRITE_CALENDAR = "android:write_calendar";
field public static final java.lang.String OPSTR_WRITE_CALL_LOG = "android:write_call_log";
field public static final java.lang.String OPSTR_WRITE_CONTACTS = "android:write_contacts";
field public static final java.lang.String OPSTR_WRITE_EXTERNAL_STORAGE = "android:write_external_storage";
field public static final java.lang.String OPSTR_WRITE_SETTINGS = "android:write_settings";
}
public static abstract interface AppOpsManager.OnOpChangedListener {

2
api/system-current.txt
View File

@@ -3975,12 +3975,14 @@ package android.app {
field public static final java.lang.String OPSTR_RECEIVE_WAP_PUSH = "android:receive_wap_push";
field public static final java.lang.String OPSTR_RECORD_AUDIO = "android:record_audio";
field public static final java.lang.String OPSTR_SEND_SMS = "android:send_sms";
field public static final java.lang.String OPSTR_SYSTEM_ALERT_WINDOW = "android:system_alert_window";
field public static final java.lang.String OPSTR_USE_FINGERPRINT = "android:use_fingerprint";
field public static final java.lang.String OPSTR_USE_SIP = "android:use_sip";
field public static final java.lang.String OPSTR_WRITE_CALENDAR = "android:write_calendar";
field public static final java.lang.String OPSTR_WRITE_CALL_LOG = "android:write_call_log";
field public static final java.lang.String OPSTR_WRITE_CONTACTS = "android:write_contacts";
field public static final java.lang.String OPSTR_WRITE_EXTERNAL_STORAGE = "android:write_external_storage";
field public static final java.lang.String OPSTR_WRITE_SETTINGS = "android:write_settings";
}
public static abstract interface AppOpsManager.OnOpChangedListener {

10
core/java/android/app/AppOpsManager.java
View File

@@ -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,