Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 736f63e1 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Unlock icon regardless of transient error" into qt-r1-dev 

am: ce22fb44

Change-Id: I58f238896ab1c5591c3f7683e28b640f6f584d0e
parents b4f3c5d4 ce22fb44

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

+3 −3
Original line number Diff line number Diff line
@@ -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 {