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

Commit 5dcdf356 authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Don't listen for face when in `lockout` or `lockdown` 

Fixes: 132668248
Test: manual -- checked lock icon doesn't indicate face auth is running
after entering the wrong pin 5 times.

Change-Id: I2a255d53aa38eb46bf136f2b8fcbb5364cb3a81b
parent f80234a9

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+5 −1
Original line number Diff line number Diff line
@@ -1658,13 +1658,17 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
    private boolean shouldListenForFace() {

        final boolean awakeKeyguard = mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep;

        final int user = getCurrentUser();

        final int strongAuth = mStrongAuthTracker.getStrongAuthForUser(user);

        final boolean isLockOutOrLockDown =

                strongAuth == StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT

                        || strongAuth == StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

        // Only listen if this KeyguardUpdateMonitor belongs to the primary user. There is an

        // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.

        return (mBouncer || mAuthInterruptActive || awakeKeyguard || shouldListenForFaceAssistant())

                && !mSwitchingUser && !getUserCanSkipBouncer(user) && !isFaceDisabled(user)

                && !mKeyguardGoingAway && mFaceSettingEnabledForUser && !mLockIconPressed

                && mUserManager.isUserUnlocked(user) && mIsPrimaryUser

                && !mSecureCameraLaunched;

                && !mSecureCameraLaunched && !isLockOutOrLockDown;

    }



    /**