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

Commit eabe95fd authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] update shared libraries if the old package used it" into tm-dev am: f77a4fd3 

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



Change-Id: I04e46d88605660d065373708e8f538b72d3fe8fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0368273c f77a4fd3

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

+4 −1
Original line number Diff line number Diff line
@@ -335,7 +335,10 @@ final class InstallPackageHelper { 
            mPm.mTransferredPackages.add(pkg.getPackageName());

        }



        if (reconciledPkg.mCollectedSharedLibraryInfos != null) {

        if (reconciledPkg.mCollectedSharedLibraryInfos != null

                || (oldPkgSetting != null && oldPkgSetting.getUsesLibraryInfos() != null)) {

            // Reconcile if the new package or the old package uses shared libraries.

            // It is possible that the old package uses shared libraries but the new one doesn't.

            mSharedLibraries.executeSharedLibrariesUpdateLPw(pkg, pkgSetting, null, null,

                    reconciledPkg.mCollectedSharedLibraryInfos, allUsers);

        }