commit fee97bacbc227f854641648a72d71f621d4955b0
author Shawn Willden <swillden@google.com> Wed Jan 06 06:21:51 2021 -0700
committer Shawn Willden <swillden@google.com> Wed Jan 06 12:19:55 2021 -0700
tree ce15c52f0194fa02e815924f6069ba816aeb7955
parent 4eb712473e583e3c6189b8011e55cf685c4b2528

Revert "Revert "Revise KeymasterMessage versioning system""

This reverts commit ebbac3d4bce59f644ba523e47063543371831c87.

Test: Build amlogic (previously passed other relevant tests).
Bug: 176867651
Change-Id: Icd6e8df352f8ec5d43a5a18e60d568c35902d588

ng/AndroidKeymaster41Device.cpp

diff --git a/ng/AndroidKeymaster41Device.cpp b/ng/AndroidKeymaster41Device.cpp
index 8d57fd2..c360ff2 100644
--- a/ng/AndroidKeymaster41Device.cpp
+++ b/ng/AndroidKeymaster41Device.cpp
@@ -51,7 +51,10 @@
     serializableToken.mac =
         KeymasterBlob(verificationToken.mac.data(), verificationToken.mac.size());
     return legacy_enum_conversion(
-        impl_->DeviceLocked(DeviceLockedRequest(passwordOnly, std::move(serializableToken))).error);
+        impl_
+            ->DeviceLocked(DeviceLockedRequest(impl_->message_version(), passwordOnly,
+                                               std::move(serializableToken)))
+            .error);
 }
 
 Return<V41ErrorCode> AndroidKeymaster41Device::earlyBootEnded() {