Merge "[pm] update shared libraries if the old package used it" into tm-dev am: f77a4fd308 am: 6170b6514a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18589115 Change-Id: I04fa5da31773b09a6c797154339a570993f1b43f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user