| commit | ebbac3d4bce59f644ba523e47063543371831c87 | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Wed Jan 06 06:39:50 2021 +0000 |
| committer | Bonian Chen <bonianchen@google.com> | Wed Jan 06 06:41:05 2021 +0000 |
| tree | 1001b4d843196b3ffcdf0068122e85bc1b6968fb | |
| parent | 15d2adf2b04b041a9ddd7eb8e29da90585c8ce8b [diff] [blame] |
Revert "Revise KeymasterMessage versioning system" Revert "Add new message versioning protocol" Revert submission 1533821-new_km_versioning Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=adt3-userdebug&lkgb=7064747&lkbb=7064769&fkbb=7064769, bug 176867651 Reverted Changes: I040fe7f62:Revise KeymasterMessage versioning system Ibea104c39:Revise KeymasterMessage versioning system Ibea104c39:Revise KeymasterMessage versioning system I425fb45fc:Add new message versioning protocol Change-Id: Ifee521bb4f499e77b7a5d9b650c1ba6c3c683649 BUG: 176867651
diff --git a/ng/AndroidKeymaster41Device.cpp b/ng/AndroidKeymaster41Device.cpp index c360ff2..8d57fd2 100644 --- a/ng/AndroidKeymaster41Device.cpp +++ b/ng/AndroidKeymaster41Device.cpp
@@ -51,10 +51,7 @@ serializableToken.mac = KeymasterBlob(verificationToken.mac.data(), verificationToken.mac.size()); return legacy_enum_conversion( - impl_ - ->DeviceLocked(DeviceLockedRequest(impl_->message_version(), passwordOnly, - std::move(serializableToken))) - .error); + impl_->DeviceLocked(DeviceLockedRequest(passwordOnly, std::move(serializableToken))).error); } Return<V41ErrorCode> AndroidKeymaster41Device::earlyBootEnded() {