From ce076c1dee8c24bab45a6b8cbc88e0ef819d0131 Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Wed, 29 Mar 2023 10:25:14 -0700
Subject: [PATCH] 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.
Test: sim pin and sim puk are good to go
Change-Id: I9fce3bb8087cd3b47ed57ae0f114b823de980356
---
 .../KeyguardAbsKeyInputViewController.java        | 15 +++++++--------
 .../keyguard/KeyguardPatternViewController.java   |  8 ++++++--
 .../KeyguardAbsKeyInputViewControllerTest.java    |  7 +++++++
 .../keyguard/KeyguardPatternViewControllerTest.kt |  7 +++++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
index f8cb38d7488b9..1980f70d63a41 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java
@@ -107,14 +107,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
         // start fresh
         mDismissing = false;
         mView.resetPasswordText(false /* animate */, false /* announce */);
-        // if the user is currently locked out, enforce it.
-        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(
-                KeyguardUpdateMonitor.getCurrentUser());
-        if (shouldLockout(deadline)) {
-            handleAttemptLockout(deadline);
-        } else {
-            resetState();
-        }
+        resetState();
     }
 
     @Override
@@ -277,6 +270,12 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey
     @Override
     public void onResume(int reason) {
         mResumed = true;
+        // if the user is currently locked out, enforce it.
+        long deadline = mLockPatternUtils.getLockoutAttemptDeadline(
+                KeyguardUpdateMonitor.getCurrentUser());
+        if (shouldLockout(deadline)) {
+            handleAttemptLockout(deadline);
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
index 0c1748982e51a..72333cc9417df 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java
@@ -260,13 +260,17 @@ public class KeyguardPatternViewController
         mLockPatternView.setEnabled(true);
         mLockPatternView.clearPattern();
 
+        displayDefaultSecurityMessage();
+    }
+
+    @Override
+    public void onResume(int reason) {
+        super.onResume(reason);
         // if the user is currently locked out, enforce it.
         long deadline = mLockPatternUtils.getLockoutAttemptDeadline(
                 KeyguardUpdateMonitor.getCurrentUser());
         if (deadline != 0) {
             handleAttemptLockout(deadline);
-        } else {
-            displayDefaultSecurityMessage();
         }
     }
 
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
index 50645e5daa09e..1ba9931e1bc87 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
@@ -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;
@@ -157,4 +158,10 @@ public class KeyguardAbsKeyInputViewControllerTest extends SysuiTestCase {
         mKeyguardAbsKeyInputViewController.reset();
         verify(mKeyguardMessageAreaController).setMessage("", false);
     }
+
+    @Test
+    public void testResume() {
+        mKeyguardAbsKeyInputViewController.onResume(KeyguardSecurityView.VIEW_REVEALED);
+        verify(mLockPatternUtils).getLockoutAttemptDeadline(anyInt());
+    }
 }
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt
index 85dbdb8330a3f..a8d5569a1b984 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPatternViewControllerTest.kt
@@ -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,10 @@ class KeyguardPatternViewControllerTest : SysuiTestCase() {
     mKeyguardPatternViewController.startAppearAnimation()
     verify(mKeyguardMessageAreaController, never()).setMessage(anyString(), anyBoolean())
   }
+
+  @Test
+  fun resume() {
+    mKeyguardPatternViewController.onResume(KeyguardSecurityView.VIEW_REVEALED)
+    verify(mLockPatternUtils).getLockoutAttemptDeadline(anyInt())
+  }
 }