summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Bookatz <bookatz@google.com> 2023-03-15 01:43:55 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-03-15 01:43:55 +0000
commitbd37127ef19f4285cf1ffeea710bbeea930f45e3 (patch)
treef01ce28ddb03fdffaecd4eb8de5a2bbd301f6d81
parent3ba96541969c3256be244196aa0d7e368aa6a4f7 (diff)
parent23db4a68353e4e7dc61af3c3f685b61722f77a90 (diff)
Merge "[Bugfix]check whitelisted packages exclude nonsystem app"
-rw-r--r--services/core/java/com/android/server/pm/UserSystemPackageInstaller.java2
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