diff options
| author | Shawn Willden <swillden@google.com> | 2017-12-12 22:08:45 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2018-01-04 15:47:52 -0700 |
| commit | 4d4e832752e5d3ae2a67b40dd4ebe7828c1d419b (patch) | |
| tree | 16230272d62413d3ab1ff830ea16696b510c89e6 | |
| parent | fb9b2a455f205710553bbec8944fc9d77b94c80b (diff) | |
| download | keymaster-4d4e832752e5d3ae2a67b40dd4ebe7828c1d419b.tar.gz | |
Update to "clean break" Keymaster::4.0
Keymaster 4.0 is being revised to remove references to 3.0, so we
don't have to deal with a mixture of types. This CL updates
system/keymaster for that change.
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: I3dfaf6ff61390bd1037b2ddb829b3aa22ff99c94
| -rw-r--r-- | ng/include/AndroidKeymaster4Device.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ng/include/AndroidKeymaster4Device.h b/ng/include/AndroidKeymaster4Device.h index 73445d3..d6fbd15 100644 --- a/ng/include/AndroidKeymaster4Device.h +++ b/ng/include/AndroidKeymaster4Device.h @@ -20,7 +20,6 @@ #include <android/hardware/keymaster/4.0/IKeymasterDevice.h> -#include <hidl/MQDescriptor.h> #include <hidl/Status.h> namespace keymaster { @@ -34,7 +33,7 @@ using ::android::sp; using ::android::hardware::hidl_vec; using ::android::hardware::Return; using ::android::hardware::Void; -using ::android::hardware::keymaster::V3_0::KeyFormat; +using ::android::hardware::keymaster::V4_0::KeyFormat; using ::android::hardware::keymaster::V4_0::ErrorCode; using ::android::hardware::keymaster::V4_0::HardwareAuthToken; using ::android::hardware::keymaster::V4_0::HmacSharingParameters; |