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

Commit 4dc61959 authored by Aaron Liu's avatar Aaron Liu
Browse files

Set lockout in onResume. 

If bouncer is locked out, make sure that we check in onresume for all
security types.

Fixes: 275079518
Test: lock out in pin and pattern
Change-Id: Ic81ad683e3e2e220f792a828c43f019928db4268
parent 50c1aaa2

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

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    @Override

    public void onResume(int reason) {

        mResumed = true;

        reset();

    }



    @Override

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

+6 −0
Original line number Diff line number Diff line
@@ -270,6 +270,12 @@ public class KeyguardPatternViewController 
        }

    }



    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        reset();

    }



    @Override

    public void onPause() {

        super.onPause();

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

+11 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.keyguard;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;
@@ -151,10 +152,19 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase { 
                false);

    }





    @Test

    public void testReset() {

        mKeyguardAbsKeyInputViewController.reset();

        verify(mKeyguardMessageAreaController).setMessage("", false);

        verify(mAbsKeyInputView).resetPasswordText(false, false);

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

    }



    @Test

    public void onResume_Reset() {

        mKeyguardAbsKeyInputViewController.onResume(KeyguardSecurityView.VIEW_REVEALED);

        verify(mKeyguardMessageAreaController).setMessage("", false);

        verify(mAbsKeyInputView).resetPasswordText(false, false);

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

    }

}

packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt

+21 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import org.junit.Before 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyInt

import org.mockito.ArgumentMatchers.anyString

import org.mockito.Mock

import org.mockito.Mockito.never
@@ -119,4 +120,24 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() { 
    mKeyguardPatternViewController.startAppearAnimation()

    verify(mKeyguardMessageAreaController, never()).setMessage(anyString(), anyBoolean())

  }



  @Test

  fun reset() {

    mKeyguardPatternViewController.reset()

    verify(mLockPatternView).setInStealthMode(anyBoolean())

    verify(mLockPatternView).enableInput()

    verify(mLockPatternView).setEnabled(true)

    verify(mLockPatternView).clearPattern()

    verify(mLockPatternUtils).getLockoutAttemptDeadline(anyInt())

  }



  @Test

  fun resume() {

    mKeyguardPatternViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)

    verify(mLockPatternView).setInStealthMode(anyBoolean())

    verify(mLockPatternView).enableInput()

    verify(mLockPatternView).setEnabled(true)

    verify(mLockPatternView).clearPattern()

    verify(mLockPatternUtils).getLockoutAttemptDeadline(anyInt())

  }

}