Do not send nextWakeupTime to findTouchedWindowTargetsLocked
This function does not need this variable, so let's not send it, to
prevent confusion.
Bug: 211379801
Test: build only
Change-Id: I487cac5de0cca72d5c55ed0943bd630661b7b5ce
diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 694c127..ab73af9 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -1692,8 +1692,7 @@
}
std::vector<TouchedWindow> touchedWindows =
- findTouchedWindowTargetsLocked(currentTime, *entry, nextWakeupTime,
- &conflictingPointerActions,
+ findTouchedWindowTargetsLocked(currentTime, *entry, &conflictingPointerActions,
/*byref*/ injectionResult);
for (const TouchedWindow& touchedWindow : touchedWindows) {
LOG_ALWAYS_FATAL_IF(injectionResult != InputEventInjectionResult::SUCCEEDED,
@@ -2036,8 +2035,8 @@
}
std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(
- nsecs_t currentTime, const MotionEntry& entry, nsecs_t* nextWakeupTime,
- bool* outConflictingPointerActions, InputEventInjectionResult& outInjectionResult) {
+ nsecs_t currentTime, const MotionEntry& entry, bool* outConflictingPointerActions,
+ InputEventInjectionResult& outInjectionResult) {
ATRACE_CALL();
std::vector<TouchedWindow> touchedWindows;
diff --git a/services/inputflinger/dispatcher/InputDispatcher.h b/services/inputflinger/dispatcher/InputDispatcher.h
index dea2cae..c2fe196 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -546,8 +546,7 @@
nsecs_t currentTime, const EventEntry& entry, nsecs_t* nextWakeupTime,
android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);
std::vector<TouchedWindow> findTouchedWindowTargetsLocked(
- nsecs_t currentTime, const MotionEntry& entry, nsecs_t* nextWakeupTime,
- bool* outConflictingPointerActions,
+ nsecs_t currentTime, const MotionEntry& entry, bool* outConflictingPointerActions,
android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);
std::vector<Monitor> selectResponsiveMonitorsLocked(
const std::vector<Monitor>& gestureMonitors) const REQUIRES(mLock);