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

* commit 'b2856ddbd3555ccffa704496293497f091c2237e':
  [gatekeeperd] invalidate stale password cache
This commit is contained in:
Andres Morales 2015-06-23 21:05:56 +00:00 committed by Android Git Automerger
commit 343d708234

View file

@ -151,8 +151,8 @@ public:
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;