Merge "Disallow pruning system shared static libraries" (d942bd15) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -4700,6 +4700,11 @@ public class PackageManagerService extends IPackageManager.Stub
		if (ps == null \|\| now - ps.lastUpdateTime < maxCachePeriod) {
		continue;
		}

		if (ps.pkg.isSystem()) {
		continue;
		}

		if (packagesToDelete == null) {
		packagesToDelete = new ArrayList<>();
		}
		@@ -5149,7 +5154,7 @@ public class PackageManagerService extends IPackageManager.Stub
		continue;
		}

		if (!ps.getUserState().get(userId).isAvailable(flags)) {
		if (!ps.readUserState(userId).isAvailable(flags)) {
		continue;
		}

		@@ -6980,8 +6985,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		final PackageSetting ps = mSettings.mPackages.get(mInstantAppInstallerActivity.packageName);
		if (ps == null
		\|\| ps.getUserState().get(userId) == null
		\|\| !ps.getUserState().get(userId).isEnabled(mInstantAppInstallerActivity, 0)) {
		\|\| !ps.readUserState(userId).isEnabled(mInstantAppInstallerActivity, 0)) {
		return result;
		}
		final ResolveInfo ephemeralInstaller = new ResolveInfo(mInstantAppInstallerInfo);