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

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

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

am: 990d25bd

Change-Id: Iffeee7386623128a4228cb8efc1d6fe5af19e865
parents cd42a2d4 990d25bd

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;

    }