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

Commit d08d74f0 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Add all shared info libraries in first pass" into udc-dev am: 5a3cfb60 

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



Change-Id: I14ee04ad3677c7e05773a94535a33cfbedf16f57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8674a5df 5a3cfb60

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

+6 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ final class ReconcilePackageUtils { 


        for (InstallRequest installRequest :  installRequests) {

            installRequest.onReconcileStarted();

            final String installPackageName = installRequest.getParsedPackage().getPackageName();



            // add / replace existing with incoming packages

            combinedPackages.put(installRequest.getScannedPackageSetting().getPackageName(),
@@ -89,7 +88,12 @@ final class ReconcilePackageUtils { 
                    }

                }

            }

        }



        for (InstallRequest installRequest : installRequests) {

            final String installPackageName = installRequest.getParsedPackage().getPackageName();

            final List<SharedLibraryInfo> allowedSharedLibInfos =

                    sharedLibraries.getAllowedSharedLibInfos(installRequest);



            final DeletePackageAction deletePackageAction;

            // we only want to try to delete for non system apps