From 7f1396d3f838786f0e49854d284a95c49ac35161 Mon Sep 17 00:00:00 2001
From: susnata <susnata@google.com>
Date: Fri, 23 Jun 2017 09:13:05 -0700
Subject: [PATCH] Fix for the missing focus in WebView form fields.

This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.

Bug: 62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2

(cherry pick from commit 97640400c4aa6bf05d5606ea749b54ad63de97cd)
---
 .../android/captiveportallogin/CaptivePortalLoginActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 7480ad164f682..a9eb6c7d1b1dc 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -378,6 +378,9 @@ public class CaptivePortalLoginActivity extends Activity {
                 return;
             } else if (mPagesLoaded == 2) {
                 // Prevent going back to empty first page.
+                // Fix for missing focus, see b/62449959 for details. Remove it once we get a
+                // newer version of WebView (60.x.y).
+                view.requestFocus();
                 view.clearHistory();
             }
             testForCaptivePortal();