commit 7169a8470f6539036addf3c960b075af224e83e2
author Chad Brubaker <cbrubaker@google.com> Wed Apr 29 19:58:34 2015 -0700
committer Alex Klyubin <klyubin@google.com> Wed Apr 29 20:32:43 2015 -0700
tree 5785cea1bdcf6ec1e2d758e6637be27e31f4e7cf
parent 0cf34a249c008743cf2e2371743a89f86aa4b03c

Fix addOperationAuthTokenIfNeeded lookup

(cherry picked from commit 6b541163b3f3271f48e6ff74d1f1da64c6bb8802)

Bug: 20702036
Change-Id: I4caa9f7a6e6e2b05f63b12180a5af65d3a5c0bac

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 455a836..ff08a0d 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2947,8 +2947,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;