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

Commit 12014367 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package. am: 03bb8eee 

am: 1b91bf22

Change-Id: Id599f489f0e94e78840cb82f951821db8f9a7e72
parents 9f271925 1b91bf22

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -2098,7 +2098,8 @@ public class PermissionManagerService { 


        final PackageParser.Package pkg = mPackageManagerInt.getPackage(packageName);

        if (pkg == null || pkg.mExtras == null) {

            throw new IllegalArgumentException("Unknown package: " + packageName);

            Log.e(TAG, "Unknown package: " + packageName);

            return;

        }

        final BasePermission bp;

        synchronized(mLock) {
@@ -2239,7 +2240,8 @@ public class PermissionManagerService { 


        final PackageParser.Package pkg = mPackageManagerInt.getPackage(packageName);

        if (pkg == null || pkg.mExtras == null) {

            throw new IllegalArgumentException("Unknown package: " + packageName);

            Log.e(TAG, "Unknown package: " + packageName);

            return;

        }

        if (mPackageManagerInt.filterAppAccess(pkg, Binder.getCallingUid(), userId)) {

            throw new IllegalArgumentException("Unknown package: " + packageName);