From 77074f83e29c4520673eb742cb48046624435b2f Mon Sep 17 00:00:00 2001 From: relan Date: Thu, 25 Feb 2016 17:54:53 +0300 Subject: [PATCH] Remove PackageInfo.REQUESTED_PERMISSION_REQUIRED This flag existed in Android 4.2-5.1 and has always been set. Stop checking it. --- .../privileged/views/AppSecurityPermissions.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 66ac0e77e..13b7801c3 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -429,17 +429,11 @@ public class AppSecurityPermissions { 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 isRequired = - (newReqFlags & PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 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 || isGranted || - Build.VERSION.SDK_INT < 16)) { + // Dangerous and normal permissions are always shown to the user + if (isNormal || isDangerous) { return true; }