diff options
| author | Billy Lau <billylau@google.com> | 2015-07-20 17:57:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 17:57:30 +0000 |
| commit | 072e04a7f1a167dc653b5bcca4876fecfdb4f6be (patch) | |
| tree | 8b4616c3c5a33b64c5fef6582b2aab348ff0366a /api | |
| parent | 71780e79846d0ccc2aef2214041657410a8a14c2 (diff) | |
| parent | 24b9c8314bf67637daf0d3b28440e0d5f08502c2 (diff) | |
| download | frameworks_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 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 4a7dc82..426cbd6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 { diff --git a/api/system-current.txt b/api/system-current.txt index e83f8c6..3d11612 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 { |