commit 696308f1de910d455390a2df45c967e0189a6a80
author Siarhei Vishniakou <svv@google.com> Fri Oct 27 19:55:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 27 19:55:53 2023 +0000
tree c1a611b37190f1526b83cdeca3baa82e7fa552e0
parent 0e5421dcdc7c8a46d0d9f9d18ce19a7e53e60a85
parent 4bd0b7c2a228fb19dac58e238b8599aa88d98428

Merge "Dump dispatcher state before crashing" into main

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 7dfbf94..53e0855 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2910,7 +2910,10 @@
         it = inputTargets.end() - 1;
     }
 
-    LOG_ALWAYS_FATAL_IF(it->flags != targetFlags);
+    if (it->flags != targetFlags) {
+        logDispatchStateLocked();
+        LOG(FATAL) << "Flags don't match! targetFlags=" << targetFlags.string() << ", it=" << *it;
+    }
     LOG_ALWAYS_FATAL_IF(it->globalScaleFactor != windowInfo->globalScaleFactor);
 
     it->addPointers(pointerIds, windowInfo->transform);