diff options
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.cpp | 10 | ||||
| -rw-r--r-- | services/inputflinger/dispatcher/InputDispatcher.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp index 4e3330a6bc..3346f07bb8 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.cpp +++ b/services/inputflinger/dispatcher/InputDispatcher.cpp @@ -4112,11 +4112,11 @@ std::unique_ptr<MotionEntry> InputDispatcher::splitMotionEvent( } } - 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(); diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h index 3029e6fde6..53b140e507 100644 --- a/services/inputflinger/dispatcher/InputDispatcher.h +++ b/services/inputflinger/dispatcher/InputDispatcher.h @@ -202,7 +202,7 @@ private: DropReason mLastDropReason GUARDED_BY(mLock); - const IdGenerator mIdGenerator; + const IdGenerator mIdGenerator GUARDED_BY(mLock); int64_t mWindowInfosVsyncId GUARDED_BY(mLock); @@ -649,7 +649,7 @@ private: // splitDownTime refers to the time of first 'down' event on that particular target std::unique_ptr<MotionEntry> splitMotionEvent(const MotionEntry& originalMotionEntry, std::bitset<MAX_POINTER_ID + 1> pointerIds, - nsecs_t splitDownTime); + nsecs_t splitDownTime) REQUIRES(mLock); // Reset and drop everything the dispatcher is doing. void resetAndDropEverythingLocked(const char* reason) REQUIRES(mLock); |