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

Commit c1267a3b authored by Will Burr's avatar Will Burr
Browse files

Add all shared info libraries in first pass 

Breaks the loop over install requests into two, to ensure that the
shared info libraries are added to the package version map before the
shared library check takes place.

Fixes: 273298881
Test: manual
Change-Id: Ibb513d93d2288c966d17c4d2540cdc91f0dc7c1d
parent 9a5ff712

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