Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev

2015-09-03 18:59:37 +00:00
parent 7d223aeef8 e07cbaf53c
commit 1b5cc3a4ba
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -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;
        }