commit 76bdecb09d6a124838edf8495ce90ef4dc0cc3c8
author Prabir Pradhan <prabirmsp@google.com> Mon Jan 31 11:14:15 2022 -0800
committer Prabir Pradhan <prabirmsp@google.com> Tue Feb 15 05:44:30 2022 -0800
tree 10e1efb117dfae6af53da5e485d142e254a37665
parent dc70e405ce7d09659f83dbb234da61570dbdcee1

Invert some InputConfig flags to simplify default behavior

Invert NOT_TOUCH_MODAL to TOUCH_MODAL, and SPLIT_TOUCH to
PREVENT_SPLITTING. Modal windows and windows that prevent splitting are
exceptional behaviors, so we make sure that these show up when
outputting flag values using ftl::Flags::string().

Bug: 216806304
Test: atest inputflinger_tests
Change-Id: I7cadcc830f06ff0c63da3b61a1a7580cb031f0c2

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index a262563..f5aa45b 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -509,9 +509,8 @@
     if (inputConfig.test(WindowInfo::InputConfig::NOT_TOUCHABLE) && !windowCanInterceptTouch) {
         return false;
     }
-    const bool isModalWindow = !inputConfig.test(WindowInfo::InputConfig::NOT_FOCUSABLE) &&
-            !inputConfig.test(WindowInfo::InputConfig::NOT_TOUCH_MODAL);
-    if (!isModalWindow && !windowInfo.touchableRegionContainsPoint(x, y)) {
+    if (!inputConfig.test(WindowInfo::InputConfig::TOUCH_MODAL) &&
+        !windowInfo.touchableRegionContainsPoint(x, y)) {
         return false;
     }
     return true;