Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe57398 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

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
parent bb26732f

services/inputflinger/dispatcher/InputDispatcher.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -1692,8 +1692,7 @@ bool InputDispatcher::dispatchMotionLocked(nsecs_t currentTime, std::shared_ptr< 
        }

        }





        std::vector<TouchedWindow> touchedWindows =

        std::vector<TouchedWindow> touchedWindows =

                findTouchedWindowTargetsLocked(currentTime, *entry, nextWakeupTime,

                findTouchedWindowTargetsLocked(currentTime, *entry, &conflictingPointerActions,

                                               &conflictingPointerActions,

                                               /*byref*/ injectionResult);

                                               /*byref*/ injectionResult);

        for (const TouchedWindow& touchedWindow : touchedWindows) {

        for (const TouchedWindow& touchedWindow : touchedWindows) {

            LOG_ALWAYS_FATAL_IF(injectionResult != InputEventInjectionResult::SUCCEEDED,

            LOG_ALWAYS_FATAL_IF(injectionResult != InputEventInjectionResult::SUCCEEDED,
@@ -2036,8 +2035,8 @@ std::vector<Monitor> InputDispatcher::selectResponsiveMonitorsLocked( 
}

}





std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(

std::vector<TouchedWindow> InputDispatcher::findTouchedWindowTargetsLocked(

        nsecs_t currentTime, const MotionEntry& entry, nsecs_t* nextWakeupTime,

        nsecs_t currentTime, const MotionEntry& entry, bool* outConflictingPointerActions,

        bool* outConflictingPointerActions, InputEventInjectionResult& outInjectionResult) {

        InputEventInjectionResult& outInjectionResult) {

    ATRACE_CALL();

    ATRACE_CALL();





    std::vector<TouchedWindow> touchedWindows;

    std::vector<TouchedWindow> touchedWindows;

services/inputflinger/dispatcher/InputDispatcher.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -546,8 +546,7 @@ private: 
            nsecs_t currentTime, const EventEntry& entry, nsecs_t* nextWakeupTime,

            nsecs_t currentTime, const EventEntry& entry, nsecs_t* nextWakeupTime,

            android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);

            android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);

    std::vector<TouchedWindow> findTouchedWindowTargetsLocked(

    std::vector<TouchedWindow> findTouchedWindowTargetsLocked(

            nsecs_t currentTime, const MotionEntry& entry, nsecs_t* nextWakeupTime,

            nsecs_t currentTime, const MotionEntry& entry, bool* outConflictingPointerActions,

            bool* outConflictingPointerActions,

            android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);

            android::os::InputEventInjectionResult& outInjectionResult) REQUIRES(mLock);

    std::vector<Monitor> selectResponsiveMonitorsLocked(

    std::vector<Monitor> selectResponsiveMonitorsLocked(

            const std::vector<Monitor>& gestureMonitors) const REQUIRES(mLock);

            const std::vector<Monitor>& gestureMonitors) const REQUIRES(mLock);