commit 81815917c0d530084099ef73be33142cef453fb1
author David Drysdale <drysdale@google.com> Mon Apr 19 19:11:41 2021 +0100
committer David Drysdale <drysdale@google.com> Wed Apr 21 07:43:23 2021 +0100
tree 24aed68d553ecdeb52e6a52bc193c99c93b80f3f
parent 40aa9048d6c5362546c2844ec05ea57a5df2f619

Align KeyMint AIDL with usage

 - Make HardwareAuthToken nullable on begin()
 - Drop unused vestigial performOperation() entrypoint

Test: TreeHugger, VtsKeyMintAidlTargetTest (CF)
Change-Id: I97938316054dda6d6e5939f0ca0e574b5e3a01f0

ng/AndroidKeyMintDevice.cpp

diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp
index d4f2659..f9bc0b0 100644
--- a/ng/AndroidKeyMintDevice.cpp
+++ b/ng/AndroidKeyMintDevice.cpp
@@ -360,7 +360,8 @@
 
 ScopedAStatus AndroidKeyMintDevice::begin(KeyPurpose purpose, const vector<uint8_t>& keyBlob,
                                           const vector<KeyParameter>& params,
-                                          const HardwareAuthToken& authToken, BeginResult* result) {
+                                          const optional<HardwareAuthToken>& authToken,
+                                          BeginResult* result) {
 
     BeginOperationRequest request(impl_->message_version());
     request.purpose = legacy_enum_conversion(purpose);
@@ -409,11 +410,6 @@
     return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
 }
 
-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);
 }