Force collecting cert for apps sharing user id with priv apps (c243fe25) · Commits · e / os / android_frameworks_base

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -9280,11 +9280,17 @@ public class PackageManagerService extends IPackageManager.Stub
		+ " better than this " + pkg.getLongVersionCode());
		}

		// Verify certificates against what was last scanned. If there was an upgrade and this is an
		// app in a system partition, or if this is an updated priv app, we will force re-collecting
		// certificate.
		final boolean forceCollect = (mIsUpgrade && scanSystemPartition)
		\|\| PackageManagerServiceUtils.isApkVerificationForced(disabledPkgSetting);
		// Verify certificates against what was last scanned. Force re-collecting certificate in two
		// special cases:
		// 1) when scanning system, force re-collect only if system is upgrading.
		// 2) when scannning /data, force re-collect only if the app is privileged (updated from
		// preinstall, or treated as privileged, e.g. due to shared user ID).
		final boolean forceCollect = scanSystemPartition ? mIsUpgrade
		: PackageManagerServiceUtils.isApkVerificationForced(pkgSetting);
		if (DEBUG_VERIFY && forceCollect) {
		Slog.d(TAG, "Force collect certificate of " + pkg.packageName);
		}

		// Full APK verification can be skipped during certificate collection, only if the file is
		// in verified partition, or can be verified on access (when apk verity is enabled). In both
		// cases, only data in Signing Block is verified instead of the whole file.

+3 −3

Original line number	Diff line number	Diff line
		@@ -565,9 +565,9 @@ public class PackageManagerServiceUtils {
		return SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED) == FSVERITY_LEGACY;
		}

		/** Returns true to force apk verification if the updated package (in /data) is a priv app. */
		static boolean isApkVerificationForced(@Nullable PackageSetting disabledPs) {
		return disabledPs != null && disabledPs.isPrivileged() && (
		/** Returns true to force apk verification if the package is considered privileged. */
		static boolean isApkVerificationForced(@Nullable PackageSetting ps) {
		return ps != null && ps.isPrivileged() && (
		isApkVerityEnabled() \|\| isLegacyApkVerityEnabled());
		}