diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-01 12:30:54 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-07-01 12:37:00 -0700 |
| commit | de15edaa9bf486a4050bb067317d313fd807bb10 (patch) | |
| tree | 489bb47ee9025eaccb14fa979f3b3e583f92fcbf /core/java/android/widget | |
| parent | 80abf887a1578669d3167ea83d52a497a64ea491 (diff) | |
| download | frameworks_base-de15edaa9bf486a4050bb067317d313fd807bb10.zip frameworks_base-de15edaa9bf486a4050bb067317d313fd807bb10.tar.gz frameworks_base-de15edaa9bf486a4050bb067317d313fd807bb10.tar.bz2 | |
Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
...to an explicit toggle to enable in Settings
Add a new permission flag, saying the permission can be automatically
granted to pre-api-23 apps. Apply this to SYSTEM_ALERT_WINDOW.
Change-Id: I24a0ceabe7e9f5e458a864d30eda2696ad14a699
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AppSecurityPermissions.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java index bb4a948..c54b28d 100644 --- a/core/java/android/widget/AppSecurityPermissions.java +++ b/core/java/android/widget/AppSecurityPermissions.java @@ -553,7 +553,8 @@ public class AppSecurityPermissions { int existingReqFlags) { final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL); - final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS); + final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS) + || ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_PRE23) != 0); final boolean isRequired = ((newReqFlags&PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0); final boolean isDevelopment = |