commit 0740d13e039d3388797673efd10cd251b1deedfa
author Wang, ArvinX <arvinx.wang@intel.com> Fri Nov 09 17:49:27 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 09 17:49:27 2018 -0800
tree 7860310e026e90ad48e7a5940630a218f2c7c038
parent 30858dc7ac24cace790b597d8dfbedda59d02a62
parent 7e4d381a48dc9557ef60cd011eb0e43e2e4ec8ee

Merge "Unable to input PIN with hardware keyboard" am: b8740842e0
am: 7e4d381a48

Change-Id: I4805c68c9d3ad609754631890f076a2ba2d2bb6c

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
index cb8c119..f400f60 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
@@ -68,12 +68,18 @@
     protected void setPasswordEntryEnabled(boolean enabled) {
         mPasswordEntry.setEnabled(enabled);
         mOkButton.setEnabled(enabled);
+        if (enabled && !mPasswordEntry.hasFocus()) {
+            mPasswordEntry.requestFocus();
+        }
     }
 
     @Override
     protected void setPasswordEntryInputEnabled(boolean enabled) {
         mPasswordEntry.setEnabled(enabled);
         mOkButton.setEnabled(enabled);
+        if (enabled && !mPasswordEntry.hasFocus()) {
+            mPasswordEntry.requestFocus();
+        }
     }
 
     @Override