diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-09-02 20:54:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 20:54:42 +0000 |
| commit | ac2b543be64a2ef83d37f749d2786f85d910bd13 (patch) | |
| tree | cefb6456312f68ac0f8532ee3c0113e4fdec4164 /packages | |
| parent | 93e6673856a0b851ca5074ae11e6f0635fb3eba9 (diff) | |
| parent | 304e3772273cd39ae55fbdc1c453d8fa50258670 (diff) | |
| download | frameworks_base-ac2b543be64a2ef83d37f749d2786f85d910bd13.zip frameworks_base-ac2b543be64a2ef83d37f749d2786f85d910bd13.tar.gz frameworks_base-ac2b543be64a2ef83d37f749d2786f85d910bd13.tar.bz2 | |
am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev
* commit '304e3772273cd39ae55fbdc1c453d8fa50258670':
Fix wrong mode for fingerprint unlock when bouncer not showing
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java index 4e69999..84082db 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java @@ -227,7 +227,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { return MODE_DISMISS_BOUNCER; } else if (unlockingAllowed) { return MODE_UNLOCK; - } else { + } else if (!mStatusBarKeyguardViewManager.isBouncerShowing()) { return MODE_SHOW_BOUNCER; } } |