commit 2e50b55b364df0e0621547cc421fc9463c17b0d4
author Janis Danisevskis <jdanis@google.com> Tue Jul 25 01:42:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 25 01:42:36 2017 +0000
tree 1883a72cada2537b2a858d65f1a72b458c806f11
parent 84557a2c72da29ad09bfe1669f85d22ed811ccaa
parent 7409453eb45803ed2f91963bae6a537b385729bc

Refurbish granting mechanism am: aca4c4cf48  -s ours
am: 7409453eb4  -s ours

Change-Id: I011d4645e72b7dc0be8ffeed73f052a1c0f68582

keystore/auth_token_table.cpp

diff --git a/keystore/auth_token_table.cpp b/keystore/auth_token_table.cpp
index 3f476cd..eea24c9 100644
--- a/keystore/auth_token_table.cpp
+++ b/keystore/auth_token_table.cpp
@@ -235,7 +235,7 @@
 
     return (token_->userId == entry.token_->userId &&
             token_->authenticatorType == entry.token_->authenticatorType &&
-            token_->authenticatorType == entry.token_->authenticatorType &&
+            token_->authenticatorId == entry.token_->authenticatorId &&
             timestamp_host_order() > entry.timestamp_host_order());
 }