| commit | e204f73890816c5b00981ac08936e3a6e144aa0a | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <ascull@google.com> | Tue May 16 23:37:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 16 23:37:05 2023 +0000 |
| tree | 721128a12c9a735d01f79f6d5cf743ac4a78bb21 | |
| parent | 787cf6274befbf32bce44542d08e839f8cba65ba [diff] | |
| parent | a45d765922dd7ee33a8cd4f8134107576c7e8a7b [diff] |
Merge "Require the config hash" am: 122b4986d4 am: a45d765922 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587808 Change-Id: I36327a8d919d4be26d8974c1164abf34db64d434 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl index 7fed363..b231dae 100644 --- a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl +++ b/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
@@ -422,7 +422,7 @@ * ; described above. * -4670545 : bstr, ; Code Hash * ? -4670546 : bstr, ; Code Descriptor - * ? -4670547 : bstr, ; Configuration Hash + * -4670547 : bstr, ; Configuration Hash * -4670548 : bstr .cbor { ; Configuration Descriptor * ? -70002 : tstr, ; Component name * ? -70003 : int / tstr, ; Component version