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

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

am d2cc888c: am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 

* commit 'd2cc888c':
  doSignaturePermission -> grantSignaturePermission
parents f4863616 d2cc888c

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

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

                allowed = false;

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

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

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

                if (allowed) {

                    allowedSig = true;

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

    }



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

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

                                          BasePermission bp, HashSet<String> origPermissions) {

        boolean allowed;

        allowed = (compareSignatures(