Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always send verification request to sufficient verifiers" into rvc-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2020-03-14 13:57:34 +00:00
committed by Android (Google) Code Review
parent 2c89227525 e729070f35
commit 57dac25bb8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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
}
}
final ComponentName requiredVerifierComponent = matchComponentForVerifier(
mRequiredVerifierPackage, receivers);
if (mRequiredVerifierPackage != null) {
final ComponentName requiredVerifierComponent = matchComponentForVerifier(
mRequiredVerifierPackage, receivers);
/*
* Send the intent to the required verification agent,
* but only start the verification timeout after the