diff options
| author | 2019-12-03 11:42:56 -0800 | |
|---|---|---|
| committer | 2019-12-03 11:42:56 -0800 | |
| commit | 701bdacbd3a286ddb102b3368efa9c6054d03103 (patch) | |
| tree | d59a95c34e23a4810bcb9077df5a2469b332f82d | |
| parent | 8e08a832dcb54b0c01590d57bc7f5176cacd81bc (diff) | |
| parent | 5bb655217d28d0d0862ed466dac2edc7b1116cb2 (diff) | |
Merge "Use KNOWN_PACKAGES when shared lib consumers"
am: 5bb655217d
Change-Id: Iad6d7ec5e804fbd364b1dd5bf89ec526ae912132
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index bb6860da186e..cec5c6d75014 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -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) { |