Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Set lockout in onResume."

Browse Source 
This reverts commit 4dc61959b8.

Bug: 275079518
Test: fixes sim pin and sim puk
Change-Id: Ia081a0ad87df51f654e89460cbeb500ad46ed3fa
This commit is contained in:
Aaron Liu
2023-03-29 10:15:54 -07:00
parent 8b8848020d
commit 1437d59472
4 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
View File

@@ -277,7 +277,6 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
@Override
public void onResume(int reason) {
mResumed = true;
reset();
}
@Override

6
packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
View File

@@ -270,12 +270,6 @@ public class KeyguardPatternViewController
}
}
@Override
public void onResume(int reason) {
super.onResume(reason);
reset();
}
@Override
public void onPause() {
super.onPause();

12
packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
View File

@@ -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());
}
}

21
packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt
View File

@@ -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())
}
}