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

Commit 701bdacb authored by Patrick Baumann's avatar Patrick Baumann Committed by android-build-merger
Browse files

Merge "Use KNOWN_PACKAGES when shared lib consumers" 

am: 5bb65521

Change-Id: Iad6d7ec5e804fbd364b1dd5bf89ec526ae912132
parents 8e08a832 5bb65521

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

+4 −3
Original line number Diff line number Diff line
@@ -18082,7 +18082,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 "
@@ -23061,8 +23061,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) {