commit 7a418bbfd67d9367c8559b8074a42ed04f14772d
author Prabir Pradhan <prabirmsp@google.com> Thu Oct 20 19:09:02 2022 +0000
committer Prabir Pradhan <prabirmsp@google.com> Tue Nov 01 22:53:38 2022 +0000
tree 6c4e063e247bd017dad3c6419a051c8ab8096d88
parent 5e0b472752331339bfb0dc588a3d72d69167b4a1

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)

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index ac720be..9c9d751 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 @@
         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);