Commit 1c9d5541 authored Sep 03, 2015 by Jorim Jaggi Committed by Android Git Automerger Sep 03, 2015

am d05c6dd3: am b991034d: am ac2b543b: am 304e3772: Merge "Fix wrong mode for...

am d05c6dd3: am b991034d: am ac2b543b: am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev

* commit 'd05c6dd3':
  Fix wrong mode for fingerprint unlock when bouncer not showing

parents 22b507a1 d05c6dd3

packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}