diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-02 13:29:42 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-09-02 16:26:34 -0700 |
| commit | e07cbaf53c545fc7176cebfe14096cabb677798a (patch) | |
| tree | ba9fe92de64a518072a224a13fb48419549cdae0 /packages | |
| parent | 9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b (diff) | |
| download | frameworks_base-e07cbaf53c545fc7176cebfe14096cabb677798a.zip frameworks_base-e07cbaf53c545fc7176cebfe14096cabb677798a.tar.gz frameworks_base-e07cbaf53c545fc7176cebfe14096cabb677798a.tar.bz2 | |
Show face unlock even when fingerprint is running
Bug: 23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index d0a7f8a..030501b 100644 --- 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; } |