Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7306da90 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 4b254881: Merge "AppSecurityPermissions: Add isGranted to... 

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

* commit '4b254881':
  AppSecurityPermissions: Add isGranted to isDisplayablePermission
parents 511d33bb 4b254881

core/java/android/widget/AppSecurityPermissions.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

        }