Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93703363 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I36a956ea64b64855bb1b2c22430008dad6264b00
parents 0229c828 2df3d4e0

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -3538,11 +3538,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);

        }

        }