Merge "Always send verification request to sufficient verifiers" into rvc-dev... (1ce1682e) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -14741,9 +14741,8 @@ public class PackageManagerService extends IPackageManager.Stub
		verificationState.setRequiredVerifierUid(requiredUid);
		final int installerUid =
		verificationInfo == null ? -1 : verificationInfo.installerUid;
		if (!origin.existing && requiredUid != -1
		&& isVerificationEnabled(
		pkgLite, verifierUser.getIdentifier(), installFlags, installerUid)) {
		if (!origin.existing && isVerificationEnabled(pkgLite, verifierUser.getIdentifier(),
		installFlags, installerUid)) {
		final Intent verification = new Intent(
		Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
		verification.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		@@ -14809,9 +14808,9 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (mRequiredVerifierPackage != null) {
		final ComponentName requiredVerifierComponent = matchComponentForVerifier(
		mRequiredVerifierPackage, receivers);
		if (mRequiredVerifierPackage != null) {
		/*
		* Send the intent to the required verification agent,
		* but only start the verification timeout after the