diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-11 02:06:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-11 02:06:40 +0000 |
| commit | d5411598680dbf49abeee9d722a5a97bc066e4c7 (patch) | |
| tree | 128d2265bdc493c04d6eaebccd0ff45c9c2518e9 /packages/Keyguard | |
| parent | b52a4a5af504daa0fb7fe28509a522e9d5153ab3 (diff) | |
| parent | a58bff50418933ee5b729deccdf8172132b560f5 (diff) | |
| download | frameworks_base-d5411598680dbf49abeee9d722a5a97bc066e4c7.zip frameworks_base-d5411598680dbf49abeee9d722a5a97bc066e4c7.tar.gz frameworks_base-d5411598680dbf49abeee9d722a5a97bc066e4c7.tar.bz2 | |
am a58bff50: am 3cf7eef1: Listen for fingerprint when on bouncer
* commit 'a58bff50418933ee5b729deccdf8172132b560f5':
Listen for fingerprint when on bouncer
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index b752c9b..47d8e28 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1032,7 +1032,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private boolean shouldListenForFingerprint() { - return (mKeyguardIsVisible || !mDeviceInteractive) && !mSwitchingUser + return (mKeyguardIsVisible || !mDeviceInteractive || mBouncer) && !mSwitchingUser && !mFingerprintAlreadyAuthenticated && !isFingerprintDisabled(getCurrentUser()); } @@ -1365,6 +1365,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { cb.onKeyguardBouncerChanged(isBouncer); } } + updateFingerprintListeningState(); } /** |