From 15e9afcb3b6e618cf996d9f47703ee97b7d01bfe Mon Sep 17 00:00:00 2001
From: Changwan Ryu <changwan@google.com>
Date: Tue, 6 Mar 2018 15:55:19 -0800
Subject: [PATCH] Expose WebView#onCheckIsTextEditor

WebView was never returning correct return value in
onCheckIsTextEditor(). However, startinput optimization work at
ag/3455281, requires a correct return value when switching between
windows. Chrome-side change (crrev.com/c/952217) has dropped into
66.0.3359.14.

BUG: 74199870
Test: manually verified
Change-Id: I954365a70f1ff2680ed9a6d76e695c1193a4cfa3
---
 api/system-current.txt                        | 1 +
 core/java/android/webkit/WebView.java         | 5 +++++
 core/java/android/webkit/WebViewProvider.java | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 0555263090932..4e426616a9063 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6655,6 +6655,7 @@ package android.webkit {
     method public abstract android.os.Handler getHandler(android.os.Handler);
     method public abstract void onActivityResult(int, int, android.content.Intent);
     method public abstract void onAttachedToWindow();
+    method public default boolean onCheckIsTextEditor();
     method public abstract void onConfigurationChanged(android.content.res.Configuration);
     method public abstract android.view.inputmethod.InputConnection onCreateInputConnection(android.view.inputmethod.EditorInfo);
     method public abstract void onDetachedFromWindow();
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index fadc3dc75e89b..5d3f1c9288cd0 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3121,6 +3121,11 @@ public class WebView extends AbsoluteLayout
         mProvider.getViewDelegate().onActivityResult(requestCode, resultCode, data);
     }
 
+    @Override
+    public boolean onCheckIsTextEditor() {
+        return mProvider.getViewDelegate().onCheckIsTextEditor();
+    }
+
     /** @hide */
     @Override
     protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {
diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java
index a8969252ff2ed..a474a8580b694 100644
--- a/core/java/android/webkit/WebViewProvider.java
+++ b/core/java/android/webkit/WebViewProvider.java
@@ -424,6 +424,11 @@ public interface WebViewProvider {
         public Handler getHandler(Handler originalHandler);
 
         public View findFocus(View originalFocusedView);
+
+        @SuppressWarnings("unused")
+        default boolean onCheckIsTextEditor() {
+            return false;
+        }
     }
 
     interface ScrollDelegate {