diff options
| author | 2024-07-09 18:24:31 +0000 | |
|---|---|---|
| committer | 2024-07-09 18:24:31 +0000 | |
| commit | d70ec3fdac6aeb23906f3471892408622b01d52f (patch) | |
| tree | d2895ec1c1d4613ee4e6398fcc238dbeddbcec27 | |
| parent | 0329491fca0415eb43a73c6d37e42d7e7c946f19 (diff) | |
| parent | b140ae9bfd0c5e4f6ea4cf7176e7506d909f9be5 (diff) | |
Merge "Allow embedded windows to use FLAG_WATCH_OUTSIDE_TOUCH" into main
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9a5f84cf7449..803312214fc3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -9299,7 +9299,8 @@ public class WindowManagerService extends IWindowManager.Stub isTrustedOverlay); final int sanitizedLpFlags = - (flags & (FLAG_NOT_TOUCHABLE | FLAG_SLIPPERY | LayoutParams.FLAG_NOT_FOCUSABLE)) + (flags & (FLAG_NOT_TOUCHABLE | FLAG_SLIPPERY | LayoutParams.FLAG_NOT_FOCUSABLE + | LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH)) | LayoutParams.FLAG_NOT_TOUCH_MODAL; h.layoutParamsType = type; h.layoutParamsFlags = sanitizedLpFlags; |