commit 59e302b89e1ddb11c0e1b7dd395962ba13b88582
author Siarhei Vishniakou <svv@google.com> Mon Jun 05 08:04:53 2023 -0700
committer Siarhei Vishniakou <svv@google.com> Mon Jun 05 17:04:53 2023 +0000
tree f658f03807df78e2f1cec6fde0ebe5c633cf7b77
parent 30f0d321c66ba665d9214ac71ca348b745f58093

Protect id generator with GUARDED_BY

The class IdGenerator is not thread safe, so we should protect the
object of this class with the lock.

This also allows us to dump the dispatcher state if the fatal log is
triggered.

Bug: 281806933
Test: none
Change-Id: I206dccc4f4991a76419b04bba3b35ac2264987df

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index fbbb388..c4d50e2 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -4112,11 +4112,11 @@
         }
     }
 
-    if (action == AMOTION_EVENT_ACTION_DOWN) {
-        LOG_ALWAYS_FATAL_IF(splitDownTime != originalMotionEntry.eventTime,
-                            "Split motion event has mismatching downTime and eventTime for "
-                            "ACTION_DOWN, motionEntry=%s, splitDownTime=%" PRId64,
-                            originalMotionEntry.getDescription().c_str(), splitDownTime);
+    if (action == AMOTION_EVENT_ACTION_DOWN && splitDownTime != originalMotionEntry.eventTime) {
+        logDispatchStateLocked();
+        LOG_ALWAYS_FATAL("Split motion event has mismatching downTime and eventTime for "
+                         "ACTION_DOWN, motionEntry=%s, splitDownTime=%" PRId64,
+                         originalMotionEntry.getDescription().c_str(), splitDownTime);
     }
 
     int32_t newId = mIdGenerator.nextId();