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

Commit 950a97c2 authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Use KNOWN_PACKAGES when shared lib consumers" into qt-qpr1-dev 

am: a5c4b9e3

Change-Id: I297d6ed7a1dd97311511036b66fe135ba5337fe6
parents b5ac0fcb a5c4b9e3

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

+4 −3
Original line number Diff line number Diff line
@@ -18637,7 +18637,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                            continue;

                        }

                        List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr(

                                libraryInfo, 0, currUserId);

                                libraryInfo, MATCH_KNOWN_PACKAGES, currUserId);

                        if (!ArrayUtils.isEmpty(libClientPackages)) {

                            Slog.w(TAG, "Not removing package " + pkg.manifestPackageName

                                    + " hosting lib " + libraryInfo.getName() + " version "
@@ -23667,8 +23667,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                continue;

            }

            final String packageName = ps.pkg.packageName;

            // Skip over if system app

            if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) {

            // Skip over if system app or static shared library

            if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0

                    || !TextUtils.isEmpty(ps.pkg.staticSharedLibName)) {

                continue;

            }

            if (DEBUG_CLEAN_APKS) {