commit 1de732d2f4736a466f23cf43a0307475c74f1cd9
author Branden Archer <brarcher@google.com> Wed Dec 05 10:37:58 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 10:37:58 2018 -0800
tree 2f14314704319568c1878e17429c6502b7b24faf
parent 3e5011b77b43ca4aa075f8aabd3a82b84cfae742
parent d166a88fb928f59093206f866c769623ad576a1a

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

Change-Id: If2144150ef176c285536e100d32d65e693f184d1

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);
     }