diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 01:03:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 01:03:58 +0000 |
| commit | d46ef183b13fafd993c64692675fce9bc123e1d3 (patch) | |
| tree | 46339bd18a7fc22239b57c4590826fe05ed6af3d | |
| parent | 3e28284fb885cc3895ea7c07636bbf43c47674d6 (diff) | |
| parent | e580843476a09189f3d06c0ebe225f6312376f83 (diff) | |
| download | base-d46ef183b13fafd993c64692675fce9bc123e1d3.tar.gz | |
Use KNOWN_PACKAGES when shared lib consumers am: 08315953bc am: e580843476
Change-Id: I64af9ee49999f2de11f1a6779e116357649f63b2
| -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 221e21a98067..07e3a130191e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -19589,7 +19589,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr( - libEntry.info, 0, currUserId); + libEntry.info, MATCH_KNOWN_PACKAGES, currUserId); if (!ArrayUtils.isEmpty(libClientPackages)) { Slog.w(TAG, "Not removing package " + pkg.manifestPackageName + " hosting lib " + libEntry.info.getName() + " version " @@ -24880,8 +24880,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 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) { |