summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Chyn <kchyn@google.com> 2019-06-17 17:13:13 -0700
committer Kevin Chyn <kchyn@google.com> 2019-06-17 17:13:53 -0700
commitce135e6f7b2998a2efde8f0bb4b6d1defc5ec550 (patch)
treef7d1d4cb835849e83d4ab30942faf6baef5a9b7a
parentad1aefd334b5570ad47c091d5eb3f23ccadeee58 (diff)
Unlock icon regardless of transient error
Fixes: 135486432 Test: Comment#1 in bug above Change-Id: Ifff2d0cdf497d5114bdcd28dc9a187868be7e228
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java6
1 files changed, 3 insertions, 3 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 07436f8c27fe..69c2a706144e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -420,10 +420,10 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
private int getState() {
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
- if (mTransientBiometricsError) {
- return STATE_BIOMETRICS_ERROR;
- } else if ((mUnlockMethodCache.canSkipBouncer() || !mKeyguardShowing) && !mSimLocked) {
+ if ((mUnlockMethodCache.canSkipBouncer() || !mKeyguardShowing) && !mSimLocked) {
return STATE_LOCK_OPEN;
+ } else if (mTransientBiometricsError) {
+ return STATE_BIOMETRICS_ERROR;
} else if (updateMonitor.isFaceDetectionRunning()) {
return STATE_SCANNING_FACE;
} else {