From 23db4a68353e4e7dc61af3c3f685b61722f77a90 Mon Sep 17 00:00:00 2001
From: Wen Zhang <zhangwen8@xiaomi.corp-partner.google.com>
Date: Tue, 14 Mar 2023 13:31:34 +0000
Subject: [PATCH] [Bugfix]check whitelisted packages exclude nonsystem app

avoid set uninstalled for nonsystem app when first boot

Bug:273457409
Change-Id: I77d19122de67869340decaf979b8f08f77070dd0
Test: Build
---
 .../java/com/android/server/pm/UserSystemPackageInstaller.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java b/services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
index dfb4f2425ba75..637380c535ef4 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