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

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

Change-Id: I89d940e0835f2f6db0449e88182dd23f40d92a05
This commit is contained in:
Daniel Norman
2021-11-17 21:42:28 +00:00
committed by Automerger Merge Worker

View File

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