diff options
author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 11:50:23 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 11:50:23 -0700 |
commit | b3616bc68be22bdb5f72c190c6e09e87314e9786 (patch) | |
tree | 444e36b71db2bf584be07bb235fec099787d154a /packages | |
parent | afc4f0965798a0fbec6315a6cf59365a26a69d6f (diff) | |
parent | 2dde02ed263192cc71f7f11f120b4bf03432f508 (diff) | |
download | frameworks_base-b3616bc68be22bdb5f72c190c6e09e87314e9786.zip frameworks_base-b3616bc68be22bdb5f72c190c6e09e87314e9786.tar.gz frameworks_base-b3616bc68be22bdb5f72c190c6e09e87314e9786.tar.bz2 |
Merge tag 'android-6.0.1_r72' into HEAD
Android 6.0.1 Release 72 (M4B30X)
# gpg: Signature made Tue 04 Oct 2016 09:47:40 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Diffstat (limited to 'packages')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index f608f13..70a9f5c 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -462,7 +462,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } } - private void handleFingerprintAuthenticated() { + + private void handleFingerprintAuthenticated(int authUserId) { try { final int userId; try { @@ -471,6 +472,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { Log.e(TAG, "Failed to get current user id: ", e); return; } + if (userId != authUserId) { + Log.d(TAG, "Fingerprint authenticated for wrong user: " + authUserId); + return; + } if (isFingerprintDisabled(userId)) { Log.d(TAG, "Fingerprint disabled by DPM for userId: " + userId); return; @@ -737,7 +742,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { @Override public void onAuthenticationSucceeded(AuthenticationResult result) { - handleFingerprintAuthenticated(); + handleFingerprintAuthenticated(result.getUserId()); } @Override |