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

Merge "Don't allow verifiers to extend the timeout."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-17 00:30:52 +00:00
committed by Android (Google) Code Review
parent a76f95887c 0ea2e5dc5c
commit 2457b027a6
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/pm/VerificationParams.java
View File

@@ -507,6 +507,13 @@ final class VerificationParams extends HandlerParams {
requiredVerifierPackage, verificationTimeout,
verifierUserId, false,
REASON_PACKAGE_VERIFIER, "package verifier");
if (streaming) {
// For streaming installations, count verification timeout from the broadcast.
startVerificationTimeoutCountdown(verificationId, streaming, response,
verificationTimeout);
}
mPm.mContext.sendOrderedBroadcastAsUser(verification, verifierUser,
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT,
/* appOp= */ AppOpsManager.OP_NONE,
@@ -514,12 +521,12 @@ final class VerificationParams extends HandlerParams {
new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final Message msg = mPm.mHandler
.obtainMessage(CHECK_PENDING_VERIFICATION);
msg.arg1 = verificationId;
msg.arg2 = streaming ? 1 : 0;
msg.obj = response;
mPm.mHandler.sendMessageDelayed(msg, verificationTimeout);
if (!streaming) {
// For NON-streaming installations, count verification timeout from
// the broadcast was processed by all receivers.
startVerificationTimeoutCountdown(verificationId, streaming, response,
verificationTimeout);
}
}
}, null, 0, null, null);
@@ -532,6 +539,15 @@ final class VerificationParams extends HandlerParams {
mWaitForVerificationToComplete = true;
}
private void startVerificationTimeoutCountdown(int verificationId, boolean streaming,
PackageVerificationResponse response, long verificationTimeout) {
final Message msg = mPm.mHandler.obtainMessage(CHECK_PENDING_VERIFICATION);
msg.arg1 = verificationId;
msg.arg2 = streaming ? 1 : 0;
msg.obj = response;
mPm.mHandler.sendMessageDelayed(msg, verificationTimeout);
}
/**
* Get the default verification agent response code.
*