commit 415350082af46b5891a441d1cdcb65d425238c98
author Shawn Willden <swillden@google.com> Thu Jan 16 12:59:29 2020 -0700
committer Shawn Willden <swillden@google.com> Tue Feb 11 15:42:54 2020 -0700
tree 6c44ace042216e8204186a8f0b3be339308f46a2
parent da4957589ae72116c33e60e4cd51626b33e8639f

Transition keystore & vold to KM4.1

Test: CtsKeystoreTestCases
Change-Id: I1f59df5717eb831b029c5a37d834c3a8a3f56159
Merged-In: I1f59df5717eb831b029c5a37d834c3a8a3f56159

ng/include/AndroidKeymaster41Device.h

diff --git a/ng/include/AndroidKeymaster41Device.h b/ng/include/AndroidKeymaster41Device.h
index 3e2a77f..8e6d0f8 100644
--- a/ng/include/AndroidKeymaster41Device.h
+++ b/ng/include/AndroidKeymaster41Device.h
@@ -21,6 +21,7 @@
 #include <android/hardware/keymaster/4.1/IKeymasterDevice.h>
 #include <android/hardware/keymaster/4.1/types.h>
 #include <hidl/Status.h>
+#include <keymasterV4_1/Operation.h>
 
 #include "AndroidKeymaster4Device.h"
 
@@ -59,19 +60,6 @@
     return static_cast<ErrorCode>(error_code);
 }
 
-class Operation : public IOperation {
-  public:
-    Operation(OperationHandle handle) : handle_(handle) {}
-
-    Return<void> getOperationChallenge(getOperationChallenge_cb _hidl_cb) override {
-        _hidl_cb(convert(ErrorCode::OK), handle_);
-        return Void();
-    }
-
-  private:
-    OperationHandle handle_;
-};
-
 class AndroidKeymaster41Device : public IKeymasterDevice, public V4_0::ng::AndroidKeymaster4Device {
     using super = V4_0::ng::AndroidKeymaster4Device;
 
@@ -86,11 +74,12 @@
     Return<void> beginOp(KeyPurpose purpose, const hidl_vec<uint8_t>& key,
                          const hidl_vec<KeyParameter>& inParams, const HardwareAuthToken& authToken,
                          beginOp_cb _hidl_cb) override {
-        return super::begin(purpose, key, inParams, authToken,
-                            [&](auto hidl_err, auto hidl_params, auto hidl_handle) {
-                                _hidl_cb(convert(hidl_err), hidl_params,
-                                         new Operation(hidl_handle));
-                            });
+        return super::begin(
+            purpose, key, inParams, authToken,
+            [&](auto hidl_err, auto hidl_params, auto hidl_handle) {
+                _hidl_cb(convert(hidl_err), hidl_params,
+                         new ::android::hardware::keymaster::V4_1::support::Operation(hidl_handle));
+            });
     }
 
     Return<void> getHardwareInfo(super::getHardwareInfo_cb _hidl_cb) override {