From 3ce118c58c836209837db57354b11b748d3d96dc Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Thu, 27 May 2021 13:55:32 -0400
Subject: [PATCH] Don't request PIN field focus again unless re-enabled

Fixes: 189468877
Test: manual, atest
Change-Id: Ifda3108e2a1ba3edd738847d2439ae745565046f
---
 .../src/com/android/keyguard/KeyguardPinBasedInputView.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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