From 105f6dddf1bb6615ccf892a174328b43f9c1a1a4 Mon Sep 17 00:00:00 2001
From: Charles Chen <charlesccchen@google.com>
Date: Fri, 4 Jun 2021 14:26:06 +0000
Subject: [PATCH] Revert "Don't request PIN field focus again unless
 re-enabled"

This reverts commit 3ce118c58c836209837db57354b11b748d3d96dc.

Reason for revert: The culprit candicate CL of b/190128793. Not that this revert is just to verify if it is the real culprit of b/190128793. Doesn't mean it must be reverted
Bug: b/190128793

Change-Id: Ibd580df35590ecf0c75f6004db900b9d4aafb03a
---
 .../src/com/android/keyguard/KeyguardPinBasedInputView.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
index c95101e343415..0b8868f6d3c48 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
@@ -62,10 +62,9 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
 
     @Override
     protected void setPasswordEntryEnabled(boolean enabled) {
-        boolean wasEnabled = mPasswordEntry.isEnabled();
         mPasswordEntry.setEnabled(enabled);
         mOkButton.setEnabled(enabled);
-        if (enabled && !wasEnabled && !mPasswordEntry.hasFocus()) {
+        if (enabled && !mPasswordEntry.hasFocus()) {
             mPasswordEntry.requestFocus();
         }
     }