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

Commit 95200e6f authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev

parents 1b5cc3a4 f6d51ace

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

+1 −3
Original line number Diff line number Diff line
@@ -1348,10 +1348,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
     */

    private void handleKeyguardReset() {

        if (DEBUG) Log.d(TAG, "handleKeyguardReset");

        if (!isUnlockingWithFingerprintAllowed()) {

        updateFingerprintListeningState();

    }

    }



    /**

     * Handle {@link #MSG_KEYGUARD_BOUNCER_CHANGED}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,7 @@ public class KeyguardViewMediator extends SystemUI { 
            // Without this, settings is not enabled until the lock screen first appears

            setShowingLocked(false);

            hideLocked();

            mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();

            return;

        }