Use KNOWN_PACKAGES when shared lib consumers am: 08315953bc am: e580843476 am: d46ef183b1

Change-Id: I6a21d79dc45635a49540f5d821094925b2e71d01
This commit is contained in:
Automerger Merge Worker
2020-01-09 01:50:38 +00:00

View File

@@ -18253,7 +18253,7 @@ public class PackageManagerService extends IPackageManager.Stub
continue; continue;
} }
List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr( List<VersionedPackage> libClientPackages = getPackagesUsingSharedLibraryLPr(
libEntry.info, 0, currUserId); libEntry.info, MATCH_KNOWN_PACKAGES, currUserId);
if (!ArrayUtils.isEmpty(libClientPackages)) { if (!ArrayUtils.isEmpty(libClientPackages)) {
Slog.w(TAG, "Not removing package " + pkg.manifestPackageName Slog.w(TAG, "Not removing package " + pkg.manifestPackageName
+ " hosting lib " + libEntry.info.getName() + " version " + " hosting lib " + libEntry.info.getName() + " version "
@@ -23267,8 +23267,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
continue; continue;
} }
final String packageName = ps.pkg.packageName; final String packageName = ps.pkg.packageName;
// Skip over if system app // Skip over if system app or static shared library
if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) { if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0
|| !TextUtils.isEmpty(ps.pkg.staticSharedLibName)) {
continue; continue;
} }
if (DEBUG_CLEAN_APKS) { if (DEBUG_CLEAN_APKS) {