commit 4b6219dab386195a7be087245a0a3650fdff381e
author Bryce Lee <brycelee@google.com> Fri Jun 23 23:45:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 23 23:45:20 2017 +0000
tree 5157948f257f27f8362cd786a9e40cf55627ae98
parent c34dec82a9409b39ba7fd6d28dbceff217cf79df
parent 7e84086387cba189bb0c20f9ed17784840a2904a

Merge "Add ActivityInfo logging." into oc-dev

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 582b660..849f6a9 100644
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -360,6 +360,9 @@
                 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();