From b65e9d1c5a87aa7eb30a0f6eefd2f39d4f695932 Mon Sep 17 00:00:00 2001
From: Justin Ghan <justinghan@google.com>
Date: Tue, 20 Sep 2022 11:37:17 -0700
Subject: [PATCH] Disable handwriting initiation for password fields

Bug: 222375667
Test: atest android.widget.cts.TextViewTest
Change-Id: I93274c14ec607f5b09fc483133cc83e618d9ce3b
---
 core/java/android/widget/TextView.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 68b902f14079a..aa083eb7bee0a 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -12049,6 +12049,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
     }
 
+    @Override
+    public boolean isAutoHandwritingEnabled() {
+        return super.isAutoHandwritingEnabled() && !isAnyPasswordInputType();
+    }
+
     /** @hide */
     @Override
     public boolean isStylusHandwritingAvailable() {