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

Merge "AppSecurityPermissions: Add isGranted to isDisplayablePermission" into jb-mr2-dev

Browse Source
This commit is contained in:
Nick Kralevich
2013-03-27 16:20:26 +00:00
committed by Android (Google) Code Review
parent d9f0180ab8 7a8c135177
commit 4b2548815d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/AppSecurityPermissions.java
View File

@@ -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;
}