commit ebbac3d4bce59f644ba523e47063543371831c87
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

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

ng/AndroidKeyMintOperation.cpp

diff --git a/ng/AndroidKeyMintOperation.cpp b/ng/AndroidKeyMintOperation.cpp
index 0e95c2f..5f29b11 100644
--- a/ng/AndroidKeyMintOperation.cpp
+++ b/ng/AndroidKeyMintOperation.cpp
@@ -57,7 +57,7 @@
         return kmError2ScopedAStatus(KM_ERROR_OUTPUT_PARAMETER_NULL);
     }
 
-    UpdateOperationRequest request(impl_->message_version());
+    UpdateOperationRequest request;
     request.op_handle = opHandle_;
     if (input) {
         request.input.Reinitialize(input->data(), input->size());
@@ -67,7 +67,7 @@
         request.additional_params.Reinitialize(KmParamSet(params->params));
     }
 
-    UpdateOperationResponse response(impl_->message_version());
+    UpdateOperationResponse response;
     impl_->UpdateOperation(request, &response);
 
     *inputConsumed = 0;
@@ -101,7 +101,7 @@
             static_cast<int32_t>(ErrorCode::OUTPUT_PARAMETER_NULL)));
     }
 
-    FinishOperationRequest request(impl_->message_version());
+    FinishOperationRequest request;
     request.op_handle = opHandle_;
 
     if (input) {
@@ -116,7 +116,7 @@
         request.additional_params.Reinitialize(KmParamSet(params->params));
     }
 
-    FinishOperationResponse response(impl_->message_version());
+    FinishOperationResponse response;
     impl_->FinishOperation(request, &response);
     opHandle_ = 0;
 
@@ -132,10 +132,10 @@
 }
 
 ScopedAStatus AndroidKeyMintOperation::abort() {
-    AbortOperationRequest request(impl_->message_version());
+    AbortOperationRequest request;
     request.op_handle = opHandle_;
 
-    AbortOperationResponse response(impl_->message_version());
+    AbortOperationResponse response;
     impl_->AbortOperation(request, &response);
     opHandle_ = 0;