diff options
| author | Shawn Willden <swillden@google.com> | 2020-03-30 19:34:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-30 19:34:08 +0000 |
| commit | c8715c4401478f8096a6c1ef8100c866dd8cd62c (patch) | |
| tree | fda7f9f8366a682953a100120d615dc9244a136e | |
| parent | 590a4c7c331069aa467622068a13bafda2f2b0b4 (diff) | |
| parent | 2b6af8c8e635efa2b8377a5fc268e1b0255c4d6f (diff) | |
| download | keymaster-c8715c4401478f8096a6c1ef8100c866dd8cd62c.tar.gz | |
Remove beginOp and IOperation am: 27fa91879c am: 2fb5f33356 am: 2b6af8c8e6
Change-Id: Ie4b8ac22d2a96f1be19a1238de199da1526fe4b7
| -rw-r--r-- | ng/include/AndroidKeymaster41Device.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ng/include/AndroidKeymaster41Device.h b/ng/include/AndroidKeymaster41Device.h index 8e6d0f8..68bbcf6 100644 --- a/ng/include/AndroidKeymaster41Device.h +++ b/ng/include/AndroidKeymaster41Device.h @@ -21,7 +21,6 @@ #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" @@ -47,7 +46,6 @@ using ::android::hardware::keymaster::V4_0::OperationHandle; using ::android::hardware::keymaster::V4_0::SecurityLevel; using ::android::hardware::keymaster::V4_0::VerificationToken; using ::android::hardware::keymaster::V4_1::IKeymasterDevice; -using ::android::hardware::keymaster::V4_1::IOperation; using ::android::hardware::keymaster::V4_1::Tag; using V41ErrorCode = ::android::hardware::keymaster::V4_1::ErrorCode; @@ -71,17 +69,6 @@ class AndroidKeymaster41Device : public IKeymasterDevice, public V4_0::ng::Andro const VerificationToken& /* verificationToken */) override; Return<V41ErrorCode> earlyBootEnded() override; - 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 ::android::hardware::keymaster::V4_1::support::Operation(hidl_handle)); - }); - } - Return<void> getHardwareInfo(super::getHardwareInfo_cb _hidl_cb) override { return super::getHardwareInfo(_hidl_cb); } |