commit 343d708234636d505653d4ed1c9104463db76bab
author Andres Morales <anmorales@google.com> Tue Jun 23 21:05:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 23 21:05:56 2015 +0000
tree 89f931b0867abffa145517ff25a13cce240a4f83
parent 7f48db407edd9b5dbaf83dd5b06a09822412ec2f
parent b2856ddbd3555ccffa704496293497f091c2237e

am b2856ddb: Merge "[gatekeeperd] invalidate stale password cache" into mnc-dev

* commit 'b2856ddbd3555ccffa704496293497f091c2237e':
  [gatekeeperd] invalidate stale password cache

gatekeeperd/SoftGateKeeper.h

diff --git a/gatekeeperd/SoftGateKeeper.h b/gatekeeperd/SoftGateKeeper.h
index 4c16c52..75fe11d 100644
--- a/gatekeeperd/SoftGateKeeper.h
+++ b/gatekeeperd/SoftGateKeeper.h
@@ -151,8 +151,8 @@
 
     bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) {
         FastHashMap::const_iterator it = fast_hash_map_.find(expected_handle->user_id);
-        if (it != fast_hash_map_.end()) {
-            return VerifyFast(it->second, password);
+        if (it != fast_hash_map_.end() && VerifyFast(it->second, password)) {
+            return true;
         } else {
             if (GateKeeper::DoVerify(expected_handle, password)) {
                 uint64_t salt;