From 7a418bbfd67d9367c8559b8074a42ed04f14772d Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Thu, 20 Oct 2022 19:09:02 +0000
Subject: [PATCH] Crop touchable region to surface bounds when updating an
 InputChannel

This reverts some logic for setting the touchable region that was made
in ag/17050822.

Bug: 254681548
Test: presubmit
Change-Id: I929dd28c782992445882a2d61105aa3e5a0a99bc
(cherry picked from commit 3823c8c062e7d148dce4e48dc496c0fca827a581)
---
 .../java/com/android/server/wm/WindowManagerService.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index ac720be905638..9c9d751244e6a 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8684,11 +8684,12 @@ public class WindowManagerService extends IWindowManager.Stub
         h.ownerPid = callingPid;
 
         if (region == null) {
-            h.replaceTouchableRegionWithCrop = true;
+            h.replaceTouchableRegionWithCrop(null);
         } else {
             h.touchableRegion.set(region);
+            h.replaceTouchableRegionWithCrop = false;
+            h.setTouchableRegionCrop(surface);
         }
-        h.setTouchableRegionCrop(null /* use the input surface's bounds */);
 
         final SurfaceControl.Transaction t = mTransactionFactory.get();
         t.setInputWindowInfo(surface, h);