commit 1d7a2e7e58074d2d58db459c9ad405e2b040e1f8
author Branden Archer <brarcher@google.com> Wed Nov 21 16:51:08 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 21 16:51:08 2018 -0800
tree b10def293112ac4cb2d68f9db974c47aca6778fa
parent ed825a0ef9bba0947b84c6be7a5cdb00666679dc
parent 7017d49cb9fdaddc7e312f650ed796c40a5420c5

Merge "Fix KeyStoreClientImpl::doesKeyExist to return correct result" am: 8ba1cb3268
am: 7017d49cb9

Change-Id: I3b41da12ec0b21050a963eedafe2a053f7b7e7ea

keystore/keystore_client_impl.cpp

diff --git a/keystore/keystore_client_impl.cpp b/keystore/keystore_client_impl.cpp
index 18e9eb1..6fe0f31 100644
--- a/keystore/keystore_client_impl.cpp
+++ b/keystore/keystore_client_impl.cpp
@@ -436,7 +436,7 @@
     int32_t result;
     auto binder_result = keystore_->exist(key_name16, kDefaultUID, &result);
     if (!binder_result.isOk()) return false;  // binder error
-    return result;
+    return result == static_cast<int32_t>(ResponseCode::NO_ERROR);
 }
 
 bool KeystoreClientImpl::listKeys(const std::string& prefix,