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

Commit 55cfcd75 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android (Google) Code Review
Browse files

Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev

parents f667c8d3 94b8c937

services/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -5140,7 +5140,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                // This permission is invalid; skip it.

                // This permission is invalid; skip it.

                allowed = false;

                allowed = false;

            } else if (level == PermissionInfo.PROTECTION_SIGNATURE) {

            } else if (level == PermissionInfo.PROTECTION_SIGNATURE) {

                allowed = doSignaturePermission(perm, pkg, bp, origPermissions);

                allowed = grantSignaturePermission(perm, pkg, bp, origPermissions);

                if (allowed) {

                if (allowed) {

                    allowedSig = true;

                    allowedSig = true;

                }

                }
@@ -5224,7 +5224,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
        return allowed;

        return allowed;

    }

    }





    private boolean doSignaturePermission(String perm, PackageParser.Package pkg,

    private boolean grantSignaturePermission(String perm, PackageParser.Package pkg,

                                          BasePermission bp, HashSet<String> origPermissions) {

                                          BasePermission bp, HashSet<String> origPermissions) {

        boolean allowed;

        boolean allowed;

        allowed = (compareSignatures(

        allowed = (compareSignatures(