commit a7f5ee4d0525d82e7fa3eb9d6ccbbe7f397bb384
author Branden Archer <brarcher@google.com> Wed Dec 05 11:00:04 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 11:00:04 2018 -0800
tree 7aa1e1818c53cd9abc005e7582a69ed2b9f3e99f
parent b35512cd89d21d4832e449e0bc53891ea2042fc8
parent c6f11561115b90d543f3f694b356437f4c2dedea

Check key store result with isOk() instead of casted value am: d166a88fb9 am: 1de732d2f4
am: c6f1156111

Change-Id: I6396d608a374b3b7e696eb6e51a46621c45c9f66

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 0039ea4..251ebf7 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1162,7 +1162,7 @@
 
     std::tie(rc, wrappingKeyBlob, wrappingCharBlob, wrappingLockedEntry) =
         mKeyStore->getKeyForName(wrappingKeyName8, callingUid, TYPE_KEYMASTER_10);
-    if (!rc) {
+    if (!rc.isOk()) {
         return AIDL_RETURN(rc);
     }