| commit | 9985cdb9e1c265fb11da93a52f7164ad615cb30e | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Tue Apr 09 09:27:39 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 09 09:27:39 2024 +0000 |
| tree | dde0a0622c3f3f19af58c702fccfdea47a8e243c | |
| parent | ce3ffbc5a28f39bee717db4eaa46c1466eee0766 [diff] | |
| parent | 61c9ab4d8795bb12c0d7196e333f57b84779573d [diff] |
Merge "Make batch attestation keys/certs optional" into main am: 61c9ab4d87 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3002898 Change-Id: Id9c5746dade9ced9006e4b6a9b4aca1635dc9c29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/default/ta/lib.rs b/security/keymint/aidl/default/ta/lib.rs index fe8ad95..f002422 100644 --- a/security/keymint/aidl/default/ta/lib.rs +++ b/security/keymint/aidl/default/ta/lib.rs
@@ -86,7 +86,7 @@ )); let dev = Implementation { keys, - sign_info: Box::new(sign_info), + sign_info: Some(Box::new(sign_info)), // HAL populates attestation IDs from properties. attest_ids: None, sdd_mgr: None,