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

Commit 990d25bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev

parents bcf01e7a 129f60fe

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

+7 −1
Original line number Diff line number Diff line
@@ -1157,10 +1157,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        }

    }



    private boolean shouldListenForFingerprintAssistant() {

        return mAssistantVisible && mKeyguardOccluded

                && !mUserFingerprintAuthenticated.get(getCurrentUser(), false)

                && !mUserHasTrust.get(getCurrentUser(), false);

    }



    private boolean shouldListenForFingerprint() {

        return (mKeyguardIsVisible || !mDeviceInteractive ||

                (mBouncer && !mKeyguardGoingAway) || mGoingToSleep ||

                (mAssistantVisible && mKeyguardOccluded))

                shouldListenForFingerprintAssistant())

                && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())

                && !mKeyguardGoingAway;

    }