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

Commit 7805d9bb 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: fec0378c 

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

Change-Id: Icefc182f3dbce48171cf13cb63175d10b3dbf7eb
parents 41025624 fec0378c

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

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

        }

        synchronized(mLock) {

        synchronized(mLock) {

            final AndroidPackage pkg = mPackages.get(packageName);

            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);

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

                throw new IllegalArgumentException("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();

            final KeySetManagerService ksms = mSettings.getKeySetManagerService();

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

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

        }

        }