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

Commit 1437d594 authored by Aaron Liu's avatar Aaron Liu
Browse files

Revert "Set lockout in onResume." 

This reverts commit 4dc61959.

Bug: 275079518
Test: fixes sim pin and sim puk
Change-Id: Ia081a0ad87df51f654e89460cbeb500ad46ed3fa
parent 8b884802

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

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -270,12 +270,6 @@ 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

+1 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
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;
@@ -152,19 +151,10 @@ 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

+0 −21
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 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
@@ -120,24 +119,4 @@ 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())

  }

}