commit fcd8b15f2048b5e15dfe7c02474c4474f5878763
author Janis Danisevskis <jdanis@google.com> Wed Mar 13 17:10:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 13 17:10:05 2019 -0700
tree 2d4e7acc3696ccc7017a97302983ef65975cb8e8
parent 4e7cce916984c5d067634e4e62bde52562af5478
parent 2cd64544e03c4699e952fa9a51c64aae6ceeb3a4

Merge "keystore_backend_binder: fix misinterpretation of getKeyCharacteristics return value."
am: 2cd64544e0

Change-Id: I5eb8e986234a8fe332c2dd8d15117839c148bb91

keystore-engine/keystore_backend_binder.cpp

diff --git a/keystore-engine/keystore_backend_binder.cpp b/keystore-engine/keystore_backend_binder.cpp
index 590f005..9a7c63e 100644
--- a/keystore-engine/keystore_backend_binder.cpp
+++ b/keystore-engine/keystore_backend_binder.cpp
@@ -114,14 +114,14 @@
         LOG(ERROR) << AT << "communication error while calling keystore";
         return -1;
     }
-    if (KSReturn(error_code).isOk()) {
+    if (!KSReturn(error_code).isOk()) {
         LOG(ERROR) << AT << "getKeyCharacteristics failed: " << error_code;
         return -1;
     }
 
     auto [km_response, characteristics] = kc_future.get();
 
-    if (KSReturn(km_response.response_code()).isOk()) {
+    if (!KSReturn(km_response.response_code()).isOk()) {
         LOG(ERROR) << AT << "getKeyCharacteristics failed: " << km_response.response_code();
         return -1;
     }