am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev (b90f1de2) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -248,10 +248,10 @@ public class LockIcon extends KeyguardAffordanceView {
		return STATE_FINGERPRINT_ERROR;
		} else if (mUnlockMethodCache.canSkipBouncer()) {
		return STATE_LOCK_OPEN;
		} else if (fingerprintRunning && unlockingAllowed) {
		return STATE_FINGERPRINT;
		} else if (mUnlockMethodCache.isFaceUnlockRunning()) {
		return STATE_FACE_UNLOCK;
		} else if (fingerprintRunning && unlockingAllowed) {
		return STATE_FINGERPRINT;
		} else {
		return STATE_LOCKED;
		}