Merge "Don't check fs-verity in installer session if not enabled" (c6ee048f) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1374,7 +1374,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		"Missing existing base package");
		}
		// Default to require only if existing base has fs-verity.
		mVerityFound = params.mode == SessionParams.MODE_INHERIT_EXISTING
		mVerityFound = PackageManagerServiceUtils.isApkVerityEnabled()
		&& params.mode == SessionParams.MODE_INHERIT_EXISTING
		&& VerityUtils.hasFsverity(pkgInfo.applicationInfo.getBaseCodePath());

		try {

+4 −3

Original line number	Diff line number	Diff line
		@@ -8572,7 +8572,7 @@ public class PackageManagerService extends IPackageManager.Stub
		* match one in a trusted source, and should be done separately.
		*/
		private boolean canSkipForcedApkVerification(String apkPath) {
		if (!PackageManagerServiceUtils.isLegacyApkVerityMode()) {
		if (!PackageManagerServiceUtils.isLegacyApkVerityEnabled()) {
		return VerityUtils.hasFsverity(apkPath);
		}

		@@ -16866,10 +16866,11 @@ public class PackageManagerService extends IPackageManager.Stub
		*/
		private void setUpFsVerityIfPossible(PackageParser.Package pkg) throws InstallerException,
		PrepareFailure, IOException, DigestException, NoSuchAlgorithmException {
		if (!PackageManagerServiceUtils.isApkVerityEnabled()) {
		final boolean standardMode = PackageManagerServiceUtils.isApkVerityEnabled();
		final boolean legacyMode = PackageManagerServiceUtils.isLegacyApkVerityEnabled();
		if (!standardMode && !legacyMode) {
		return;
		}
		final boolean legacyMode = PackageManagerServiceUtils.isLegacyApkVerityMode();

		// Collect files we care for fs-verity setup.
		ArrayMap<String, String> fsverityCandidates = new ArrayMap<>();

+5 −5

Original line number	Diff line number	Diff line
		@@ -555,19 +555,19 @@ public class PackageManagerServiceUtils {
		/** Standard fs-verity. */
		private static final int FSVERITY_ENABLED = 2;

		/** Returns true if APK Verity is enabled. */
		/** Returns true if standard APK Verity is enabled. */
		static boolean isApkVerityEnabled() {
		int mode = SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED);
		return mode == FSVERITY_LEGACY \|\| mode == FSVERITY_ENABLED;
		return SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED) == FSVERITY_ENABLED;
		}

		static boolean isLegacyApkVerityMode() {
		static boolean isLegacyApkVerityEnabled() {
		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() && isApkVerityEnabled();
		return disabledPs != null && disabledPs.isPrivileged() && (
		isApkVerityEnabled() \|\| isLegacyApkVerityEnabled());
		}

		/**