commit 6b541163b3f3271f48e6ff74d1f1da64c6bb8802
author Chad Brubaker <cbrubaker@google.com> Wed Apr 29 19:58:34 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Wed Apr 29 20:01:49 2015 -0700
tree 51f7ebe89b497513465f40af32f185311b7847bb
parent 4f84ab96c73730945f5b1c4a3eff02e052e4798e

Fix addOperationAuthTokenIfNeeded lookup

Bug: 20702036
Change-Id: I08038ba0ee9e3a35f6c37ce572df284be728b4a7

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index c3896b5..b0f2337 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2944,8 +2944,8 @@
     int32_t addOperationAuthTokenIfNeeded(sp<IBinder> token,
                                           std::vector<keymaster_key_param_t>* params) {
         const hw_auth_token_t* authToken = NULL;
-        bool authTokenNeeded = !mOperationMap.getOperationAuthToken(token, &authToken);
-        if (authTokenNeeded) {
+        mOperationMap.getOperationAuthToken(token, &authToken);
+        if (!authToken) {
             const keymaster1_device_t* dev;
             keymaster_operation_handle_t handle;
             const keymaster_key_characteristics_t* characteristics = NULL;