am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev (e0c0e93a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -460,15 +460,20 @@ public class KeyguardViewMediator extends SystemUI {

		@Override
		public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) {
		boolean unlockingWithFingerprintAllowed =
		mUpdateMonitor.isUnlockingWithFingerprintAllowed();
		if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
		if (mUpdateMonitor.isUnlockingWithFingerprintAllowed()) {
		if (unlockingWithFingerprintAllowed) {
		mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated();
		}
		} else {
		if (wakeAndUnlocking) {
		if (wakeAndUnlocking && unlockingWithFingerprintAllowed) {
		mWakeAndUnlocking = true;
		keyguardDone(true, true);
		} else {
		if (wakeAndUnlocking) {
		mStatusBarKeyguardViewManager.notifyScreenWakeUpRequested();
		}
		mStatusBarKeyguardViewManager.animateCollapsePanels(
		FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
		}