diff options
| author | 2023-03-15 03:06:18 +0000 | |
|---|---|---|
| committer | 2023-03-15 03:06:18 +0000 | |
| commit | 7606d5e27d73579a758f23ef9da753cac057f26c (patch) | |
| tree | c270375e7f8cad08b6f738dc3a63e3c5809cb454 | |
| parent | c59d9a69ab8511b79aae851637a518e996a8f5d5 (diff) | |
| parent | 5e690319be5ec3da80daf7fd12a10d9686a6faf2 (diff) | |
Merge "[Bugfix]check whitelisted packages exclude nonsystem app" am: bd37127ef1 am: 5e690319be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2486997
Change-Id: Ic0ffb4b17a55a3a27b77cd1c30c11fc5679c8525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/UserSystemPackageInstaller.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java index dfb4f2425ba7..637380c535ef 100644 --- a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java +++ b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java @@ -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 |