commit c6f11561115b90d543f3f694b356437f4c2dedea
author Branden Archer <brarcher@google.com> Wed Dec 05 10:48:17 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 10:48:17 2018 -0800
tree 2f14314704319568c1878e17429c6502b7b24faf
parent 09bf086a938df8e5d05e0d7aa8fce30ff673f362
parent 1de732d2f4736a466f23cf43a0307475c74f1cd9

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

Change-Id: Ic023fb2d39eac13df05ab79fba2926cc4137c972

keystore/key_store_service.cpp

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