commit 55929697df9a76bd523fb992363fa1c29c9c4097
author Shawn Willden <swillden@google.com> Fri Feb 19 14:53:02 2021 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 03 07:14:48 2021 -0700
tree d9d9c9d450abeb68b2ee90e1df4560980714c9ff
parent dd1a028e372b74bf3e57af4bebdce964fbcf9760

Add performOperation stub.

Test: VtsAidlKeyMintTargetTest
Change-Id: I041288579fa4c32a7c4b00a580db72f239be5fe6

ng/AndroidKeyMintDevice.cpp

diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp
index 2dafd63..07490de 100644
--- a/ng/AndroidKeyMintDevice.cpp
+++ b/ng/AndroidKeyMintDevice.cpp
@@ -386,15 +386,13 @@
 }
 
 ScopedAStatus AndroidKeyMintDevice::deviceLocked(
-    bool in_passwordOnly,
-    const std::optional<::aidl::android::hardware::security::secureclock::TimeStampToken>&
-        in_timestampToken) {
+    bool passwordOnly, const std::optional<secureclock::TimeStampToken>& timestampToken) {
     DeviceLockedRequest request(impl_->message_version());
-    request.passwordOnly = in_passwordOnly;
-    if (in_timestampToken.has_value()) {
-        request.token.challenge = in_timestampToken->challenge;
-        request.token.mac = {in_timestampToken->mac.data(), in_timestampToken->mac.size()};
-        request.token.timestamp = in_timestampToken->timestamp.milliSeconds;
+    request.passwordOnly = passwordOnly;
+    if (timestampToken.has_value()) {
+        request.token.challenge = timestampToken->challenge;
+        request.token.mac = {timestampToken->mac.data(), timestampToken->mac.size()};
+        request.token.timestamp = timestampToken->timestamp.milliSeconds;
     }
     DeviceLockedResponse response = impl_->DeviceLocked(request);
     return kmError2ScopedAStatus(response.error);
@@ -405,6 +403,11 @@
     return kmError2ScopedAStatus(response.error);
 }
 
+ScopedAStatus AndroidKeyMintDevice::performOperation(const vector<uint8_t>& /* request */,
+                                                     vector<uint8_t>* /* response */) {
+    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
+}
+
 IKeyMintDevice* CreateKeyMintDevice(SecurityLevel securityLevel) {
     return ::new AndroidKeyMintDevice(securityLevel);
 }