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

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

Merge "Revise the IllegalArgumentException check" into sc-dev am: 283d6be1 am: 5ced79b9 

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

Change-Id: I28f613b2f13faebc634cd72d562ede9768617e47
parents e34375d6 5ced79b9

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

+3 −7
Original line number Diff line number Diff line
@@ -26467,16 +26467,12 @@ public class PackageManagerService extends IPackageManager.Stub 
        }

        synchronized(mLock) {

            final AndroidPackage pkg = mPackages.get(packageName);

            if (pkg == null) {

            if (pkg == null

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

                    Binder.getCallingUid(), UserHandle.getCallingUserId())) {

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

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

            }

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

            if (shouldFilterApplicationLocked(

                    ps, Binder.getCallingUid(), UserHandle.getCallingUserId())) {

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

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

            }

            final KeySetManagerService ksms = mSettings.getKeySetManagerService();

            return new KeySet(ksms.getKeySetByAliasAndPackageNameLPr(packageName, alias));

        }