diff options
| author | Nick Kralevich <nnk@google.com> | 2013-03-27 16:20:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 16:20:26 +0000 |
| commit | 4b2548815df45b3aa6a8144abeeaea504ee6f7b1 (patch) | |
| tree | 0d51ae0814ce572c62963162bec21ee3d2542761 /core/java/android | |
| parent | d9f0180ab8bb4c69dcf1535c3dfe0d8c464a7377 (diff) | |
| parent | 7a8c135177d860d713e3e905a792925c160fb177 (diff) | |
Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/AppSecurityPermissions.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java index 7c961bd40c90..b2073b13a85d 100644 --- a/core/java/android/widget/AppSecurityPermissions.java +++ b/core/java/android/widget/AppSecurityPermissions.java @@ -515,10 +515,12 @@ public class AppSecurityPermissions { ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0); final boolean wasGranted = ((existingReqFlags&PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0); + final boolean isGranted = + ((newReqFlags&PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0); // Dangerous and normal permissions are always shown to the user if the permission // is required, or it was previously granted - if ((isNormal || isDangerous) && (isRequired || wasGranted)) { + if ((isNormal || isDangerous) && (isRequired || wasGranted || isGranted)) { return true; } |