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

Commit 7606d5e2 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix]check whitelisted packages exclude nonsystem app" am: bd37127e am: 5e690319 

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



Change-Id: Ic0ffb4b17a55a3a27b77cd1c30c11fc5679c8525
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c59d9a69 5e690319

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

+1 −1
Original line number Diff line number Diff line
@@ -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