1 files changed, 4 insertions, 0 deletions
diff --git a/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java b/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java
index 01de19e200..49824da5fa 100644
--- a/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java
+++ b/WifiDialog/src/com/android/wifi/dialog/WifiDialogActivity.java
@@ -50,6 +50,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -580,7 +581,10 @@ public class WifiDialogActivity extends Activity  {
                 })
                 .create();
         if (pinEditText != null) {
+            dialog.getWindow().setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
             dialog.setOnShowListener(dialogShow -> {
+                pinEditText.requestFocus();
                 dialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false);
             });
             pinEditText.addTextChangedListener(new TextWatcher() {