commit 6f324990d076bbebbede266a672321a2845b8a93
author Shawn Willden <swillden@google.com> Fri Oct 25 11:37:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 25 11:37:35 2019 -0700
tree e9da08f0fc3afd65578600a07fe42750872a8067
parent 4b8769b12abb8d3b228160e1c0f839af5348d2e6
parent 715b334915b9bb00c66ce2fd5290831f025255bd

Fix handling of user password changes. am: 3c04bca28a
am: 715b334915

Change-Id: I68543167f1400b81e02a0741cb13993199d468f2

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 5e7efab..e1b1a66 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1039,6 +1039,10 @@
     std::tie(rc, keyBlob, charBlob, lockedEntry) =
         mKeyStore->getKeyForName(name8, callingUid, TYPE_KEYMASTER_10);
 
+    if (!rc.isOk()) {
+        return AIDL_RETURN(rc);
+    }
+
     auto dev = mKeyStore->getDevice(keyBlob);
     auto hidlKey = blob2hidlVec(keyBlob);
     dev->attestKey(