diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ac84721acff70..604cdd8355cd5 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2401,13 +2401,16 @@ public class PackageManagerService extends IPackageManager.Stub /* systemAppsOnly */ false, UserHandle.SYSTEM)); // Apply whitelist for split system user - ArraySet wlApps = SystemConfig.getInstance().getSystemUserWhitelistedApps(); - enableApps.addAll(wlApps); + ArraySet whitelistedSystemUserApps = SystemConfig.getInstance() + .getSystemUserWhitelistedApps(); + enableApps.addAll(whitelistedSystemUserApps); + Log.i(TAG, "Whitelisted packages: " + whitelistedSystemUserApps); } // Apply blacklist for split system user/headless system user - ArraySet blApps = SystemConfig.getInstance().getSystemUserBlacklistedApps(); - enableApps.removeAll(blApps); - Log.i(TAG, "Blacklisted packages: " + blApps); + ArraySet blacklistedSystemUserApps = SystemConfig.getInstance() + .getSystemUserBlacklistedApps(); + enableApps.removeAll(blacklistedSystemUserApps); + Log.i(TAG, "Blacklisted packages: " + blacklistedSystemUserApps); final int allAppsSize = allAps.size(); synchronized (mPackages) { @@ -21722,6 +21725,13 @@ public class PackageManagerService extends IPackageManager.Stub isSystemUserPackagesBlacklistSupported(); pw.println("isSystemUserPackagesBlacklistSupported: " + systemUserPackagesBlacklistSupported); + if (systemUserPackagesBlacklistSupported) { + SystemConfig sysconfig = SystemConfig.getInstance(); + dumpPackagesList(pw, " ", "whitelist", + sysconfig.getSystemUserWhitelistedApps()); + dumpPackagesList(pw, " ", "blacklist", + sysconfig.getSystemUserBlacklistedApps()); + } } if (dumpState.isDumping(DumpState.DUMP_SHARED_USERS)) { @@ -21831,6 +21841,21 @@ public class PackageManagerService extends IPackageManager.Stub } } + private void dumpPackagesList(PrintWriter pw, String prefix, String name, + ArraySet list) { + pw.print(prefix); pw.print(name); pw.print(": "); + int size = list.size(); + if (size == 0) { + pw.println("empty"); + return; + } + pw.print(size); pw.println(" packages"); + String prefix2 = prefix + " "; + for (int i = 0; i < size; i++) { + pw.print(prefix2); pw.println(list.valueAt(i)); + } + } + //TODO: b/111402650 private void disableSkuSpecificApps() { String apkList[] = mContext.getResources().getStringArray(