Merge "PackageManagerService: Check for duplicate inactive factory packages"

2021-11-17 21:24:28 +00:00
parent 1716adec5c cdaa918edc
commit 2df3d4e066
1 changed files with 3 additions and 3 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3538,9 +3538,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);