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

Commit 586116a5 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev 

* commit '41a62e11':
  Do not show normal permissions in sideloading UI
parents c00d2713 41a62e11

core/java/android/widget/AppSecurityPermissions.java

+7 −1
Original line number Diff line number Diff line
@@ -533,6 +533,12 @@ public class AppSecurityPermissions { 
            int existingReqFlags) {

        final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;

        final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);



        // We do not show normal permissions in the UI.

        if (isNormal) {

            return false;

        }



        final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS)

                || ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_PRE23) != 0);

        final boolean isRequired =
@@ -546,7 +552,7 @@ public class AppSecurityPermissions { 


        // 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)) {

        if (isDangerous && (isRequired || wasGranted || isGranted)) {

            return true;

        }