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

Commit ddd731b6 authored by Jackal Guo's avatar Jackal Guo Committed by Automerger Merge Worker
Browse files

Merge "Revise the IllegalArgumentException check" into sc-dev am: 47330ed2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972766

Change-Id: I41c1ae49a73d8d6fab3fd023fa4b8d1af3daddf2
parents 5ced79b9 47330ed2

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

+4 −8
Original line number Diff line number Diff line
@@ -26487,14 +26487,10 @@ public class PackageManagerService extends IPackageManager.Stub 
            final int callingUid = Binder.getCallingUid();

            final int callingUserId = UserHandle.getUserId(callingUid);

            final AndroidPackage pkg = mPackages.get(packageName);

            if (pkg == null) {

                Slog.w(TAG, "KeySet requested for unknown package: " + packageName);

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

            }

            final PackageSetting ps = getPackageSetting(pkg.getPackageName());

            if (shouldFilterApplicationLocked(ps, callingUid, callingUserId)) {

                // filter and pretend the package doesn't exist

                Slog.w(TAG, "KeySet requested for filtered package: " + packageName

            if (pkg == null

                    || shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),

                    callingUid, callingUserId)) {

                Slog.w(TAG, "KeySet requested for unknown package: " + packageName

                        + ", uid:" + callingUid);

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

            }