Merge "Do not send nextWakeupTime to findTouchedWindowTargetsLocked"

2 files changed, 4 insertions, 6 deletions

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index c8aff9a44e..ead093c6bd 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -1692,8 +1692,7 @@ bool InputDispatcher::dispatchMotionLocked(nsecs_t currentTime, std::shared_ptr<
         }
 
         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<Monitor> InputDispatcher::selectResponsiveMonitorsLocked(
 }
 
 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 dea2caedf8..c2fe19614f 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.h
+++ b/services/inputflinger/dispatcher/InputDispatcher.h
@@ -546,8 +546,7 @@ private:
             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);