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

Commit 0e228726 authored by Adrian Roos's avatar Adrian Roos
Browse files

resolved conflicts for merge of 123fb19d to master 

Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35
parents a0a4f474 123fb19d

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
@@ -1051,6 +1051,7 @@ public class KeyguardViewMediator extends SystemUI { 
                // Without this, settings is not enabled until the lock screen first appears

                setShowingLocked(false);

                hideLocked();

                mUpdateMonitor.reportSuccessfulStrongAuthUnlockAttempt();

                return;

            }

        }