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

Commit 89a8cf4b authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Ensure that input is disabled when locked out." into udc-dev am: 5b51213c am: f3c2698c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23698096



Change-Id: Ibfd9143297822410a87286eaf00ecd6145c5e2b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5597181d f3c2698c

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

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    private boolean mDismissing;

    protected AsyncTask<?, ?, ?> mPendingLockCheck;

    protected boolean mResumed;

    protected boolean mLockedOut;



    private final KeyDownListener mKeyDownListener = (keyCode, keyEvent) -> {

        // Fingerprint sensor sends a KeyEvent.KEYCODE_UNKNOWN.
@@ -137,6 +138,8 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    // Prevent user from using the PIN/Password entry until scheduled deadline.

    protected void handleAttemptLockout(long elapsedRealtimeDeadline) {

        mView.setPasswordEntryEnabled(false);

        mView.setPasswordEntryInputEnabled(false);

        mLockedOut = true;

        long elapsedRealtime = SystemClock.elapsedRealtime();

        long secondsInFuture = (long) Math.ceil(

                (elapsedRealtimeDeadline - elapsedRealtime) / 1000.0);
@@ -159,6 +162,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
            @Override

            public void onFinish() {

                mMessageAreaController.setMessage("");

                mLockedOut = false;

                resetState();

            }

        }.start();
@@ -194,6 +198,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 


    protected void verifyPasswordAndUnlock() {

        if (mDismissing) return; // already verified but haven't been dismissed; don't do it again.

        if (mLockedOut) return;



        final LockscreenCredential password = mView.getEnteredCredential();

        mView.setPasswordEntryInputEnabled(false);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.when;



import android.os.SystemClock;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.view.KeyEvent;
@@ -183,4 +184,15 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase { 
        mKeyguardAbsKeyInputViewController.onResume(KeyguardSecurityView.VIEW_REVEALED);

        verify(mLockPatternUtils).getLockoutAttemptDeadline(anyInt());

    }



    @Test

    public void testLockedOut_verifyPasswordAndUnlock_doesNotEnableViewInput() {

        mKeyguardAbsKeyInputViewController.handleAttemptLockout(

                SystemClock.elapsedRealtime() + 1000);

        mKeyguardAbsKeyInputViewController.verifyPasswordAndUnlock();

        verify(mAbsKeyInputView).setPasswordEntryInputEnabled(false);

        verify(mAbsKeyInputView).setPasswordEntryEnabled(false);

        verify(mAbsKeyInputView, never()).setPasswordEntryInputEnabled(true);

        verify(mAbsKeyInputView, never()).setPasswordEntryEnabled(true);

    }

}