| commit | 849d98459a3a4f7697330c668dae6d453e6706ac | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Feb 28 06:48:12 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 28 06:48:12 2025 -0800 |
| tree | 8eaa8e3d410dd2c7a8a6c0f27a1b15d7954fff46 | |
| parent | 567696d6418e4d0a36ae0cdf8f1d0c8eb950e6c1 [diff] | |
| parent | 98ece8ff252b9f7823cb11d4560fc2908a9f9095 [diff] |
Merge "Use longer watchdog deadline for RKP" into main am: 98ece8ff25 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3513732 Change-Id: I2a6df6d50f95d8899f500f634c7f4c3d978b7522 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/remote_provisioning.rs b/keystore2/src/remote_provisioning.rs index 2bdafd4..a1ce5f6 100644 --- a/keystore2/src/remote_provisioning.rs +++ b/keystore2/src/remote_provisioning.rs
@@ -129,6 +129,6 @@ // by the calling function and allow for natural fallback to the factory key. let rpc_name = get_remotely_provisioned_component_name(security_level) .context(ks_err!("Trying to get IRPC name."))?; - let _wd = wd::watch("Calling get_rkpd_attestation_key()"); + let _wd = wd::watch_millis("Calling get_rkpd_attestation_key()", 1000); rkpd_client::get_rkpd_attestation_key(&rpc_name, caller_uid) }