commit 0329a82c48aeea98b87a9ea4598a3a49619a482e
author Shawn Willden <swillden@google.com> Mon Dec 04 13:55:14 2017 -0700
committer Shawn Willden <swillden@google.com> Wed Dec 20 09:01:01 2017 -0700
tree cf6362ee88242a3f10c8f982d45294e4e623cdfe
parent c67a8aa3f536904264e64feca9009b79788ea2ae

Move keystore to Keymaster4

Test: CTS
Change-Id: I6b7fa300f505ee685b1fe503edea3188225a98e3

keystore/operation.cpp

diff --git a/keystore/operation.cpp b/keystore/operation.cpp
index 66fcee2..e09d515 100644
--- a/keystore/operation.cpp
+++ b/keystore/operation.cpp
@@ -25,8 +25,7 @@
     : mDeathRecipient(deathRecipient) {}
 
 sp<IBinder> OperationMap::addOperation(uint64_t handle, uint64_t keyid, KeyPurpose purpose,
-                                       const OperationMap::km_device_t& dev,
-                                       const sp<IBinder>& appToken,
+                                       const sp<Keymaster>& dev, const sp<IBinder>& appToken,
                                        KeyCharacteristics&& characteristics, bool pruneable) {
     sp<IBinder> token = new ::android::BBinder();
     mMap.emplace(token,
@@ -100,7 +99,7 @@
     auto entry = mMap.find(token);
     if (entry == mMap.end()) return false;
 
-    entry->second.authToken = std::make_unique<HardwareAuthToken>(std::move(authToken));
+    entry->second.authToken = std::move(authToken);
     return true;
 }
 
@@ -111,7 +110,7 @@
 }
 
 OperationMap::Operation::Operation(uint64_t handle_, uint64_t keyid_, KeyPurpose purpose_,
-                                   const OperationMap::km_device_t& device_,
+                                   const sp<Keymaster>& device_,
                                    KeyCharacteristics&& characteristics_, sp<IBinder> appToken_)
     : handle(handle_), keyid(keyid_), purpose(purpose_), device(device_),
       characteristics(characteristics_), appToken(appToken_) {}