Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 am: 9370336358 am: 3dd1c5cff5

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

Change-Id: I4d639b93ded6d761c31dbe7c0efd8795a9bb4fe1
This commit is contained in:
Daniel Norman
2021-11-17 21:48:20 +00:00
committed by Automerger Merge Worker

View File

@@ -3562,9 +3562,9 @@ public class PackageManagerService extends IPackageManager.Stub
list.addAll(mApexManager.getFactoryPackages());
} else {
list.addAll(mApexManager.getActivePackages());
}
if (listUninstalled) {
list.addAll(mApexManager.getInactivePackages());
if (listUninstalled) {
list.addAll(mApexManager.getInactivePackages());
}
}
}
return new ParceledListSlice<>(list);