From e7ab12b469b1722668c54635e7880fc055108187 Mon Sep 17 00:00:00 2001
From: Haoyu Zhang <haoyuchang@google.com>
Date: Mon, 28 Mar 2022 23:36:40 -0700
Subject: [PATCH] Scribe: fix handwriting is not initiated in WebView

View#getHandwritingArea mistakenly returned a non-null Rect even for
view's which never calls setHandwritingArea. As a result, handwriting
is not properly initation for views other than EditText.

Bug: 227278641
Test: atest android.view.inputmethod.cts.StylusHandwritingTest
Change-Id: I45700f2684a2f4138f73eaa843d3019e6c26d2f6
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 7d823b1c100d2..e71d747c12a78 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12032,7 +12032,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     @Nullable
     public Rect getHandwritingArea() {
         final ListenerInfo info = mListenerInfo;
-        if (info != null) {
+        if (info != null && info.mHandwritingArea != null) {
             return new Rect(info.mHandwritingArea);
         }
         return null;