Merge "[Bugfix]check whitelisted packages exclude nonsystem app" am: bd37127ef1 am: 5e690319be am: 7606d5e27d

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

Change-Id: Ib159476b9db05f6cabca9e5585e799e5b8749473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Bookatz
2023-03-15 03:27:22 +00:00
committed by Automerger Merge Worker

View File

@@ -222,7 +222,7 @@ class UserSystemPackageInstaller {
final Set<String> userAllowlist = getInstallablePackagesForUserId(userId);
pmInt.forEachPackageState(packageState -> {
if (packageState.getPkg() == null) {
if (packageState.getPkg() == null || !packageState.isSystem()) {
return;
}
boolean install = (userAllowlist == null