Commit 984a6359 authored Jun 18, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jun 18, 2020

Merge "Do not force to verify priv apps on boot" into rvc-dev am: 5003e792...

Merge "Do not force to verify priv apps on boot" into rvc-dev am: 5003e792 am: d9242196 am: f8b6feb0 am: 737c583d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897245

Change-Id: I42a66ace1ec7382328db15a2da06692c61492679

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -595,8 +595,8 @@ public class PackageManagerServiceUtils {

		/** 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());
		// TODO(b/154310064): re-enable.
		return false;
		}

		/**