From 7511614773cf901795f6b5487e3707e1c14de49e Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Wed, 2 Feb 2022 12:05:02 -0800
Subject: [PATCH] Make the handwriting surface NOT_TOUCHABLE

Looks like we forgot to do it. INPUT_FEATURE_INTERCEPTS_STYLUS is meant
to be used in conjunction with FLAG_NOT_TOUCHABLE. Without the latter,
the window will still receive all pointer events.

Bug: 210039666
Test: None
Change-Id: I724da1432dd3f38b82676b5ca924040f4aa78a94
---
 .../server/inputmethod/HandwritingEventReceiverSurface.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java
index 4c2616667a023..4dc5366a70920 100644
--- a/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java
+++ b/services/core/java/com/android/server/inputmethod/HandwritingEventReceiverSurface.java
@@ -57,7 +57,8 @@ final class HandwritingEventReceiverSurface {
         mWindowHandle.name = name;
         mWindowHandle.token = mClientChannel.getToken();
         mWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY;
-        mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
+        mWindowHandle.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
         mWindowHandle.dispatchingTimeoutMillis = DEFAULT_DISPATCHING_TIMEOUT_MILLIS;
         mWindowHandle.visible = true;
         mWindowHandle.focusable = false;