commit ccb75f720911cd5fa0288450276f3211b9e09e83
author Rob Sloan <varomodt@google.com> Tue Jun 27 17:47:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 27 17:47:42 2017 +0000
tree c6fa9e6d05921af363b65eac4052064386ada783
parent 0143be76b9c54df1333d12c0b5cc8cd8cedf47c3
parent ae9fa426cbcfe1ca809db06e2b5af37cbf70d5cd

Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c am: 7d6eedfc47
am: ae9fa426cb

Change-Id: I9a9d83f80afe33990769d6eb07b9b5374f9291e4

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