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

Commit f75cddb3 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Mark addWindowTargetLocked as const 

While figuring out how to refactor 'findTouchedWindowTargetsLocked',
it's helpful to understand where the state is being modified in that
function.
Let's mark addWindowTargetLocked as const to help with the analysis.

Bug: 211379801
Test: build
Change-Id: Ifd0a67bc915996e5401f3d624958660a8680ad19
parent 8bc3a172

services/inputflinger/dispatcher/InputDispatcher.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -2578,7 +2578,7 @@ void InputDispatcher::addDragEventLocked(const MotionEntry& entry) { 
void InputDispatcher::addWindowTargetLocked(const sp<WindowInfoHandle>& windowHandle,

void InputDispatcher::addWindowTargetLocked(const sp<WindowInfoHandle>& windowHandle,

                                            int32_t targetFlags, BitSet32 pointerIds,

                                            int32_t targetFlags, BitSet32 pointerIds,

                                            std::optional<nsecs_t> firstDownTimeInTarget,

                                            std::optional<nsecs_t> firstDownTimeInTarget,

                                            std::vector<InputTarget>& inputTargets) {

                                            std::vector<InputTarget>& inputTargets) const {

    std::vector<InputTarget>::iterator it =

    std::vector<InputTarget>::iterator it =

            std::find_if(inputTargets.begin(), inputTargets.end(),

            std::find_if(inputTargets.begin(), inputTargets.end(),

                         [&windowHandle](const InputTarget& inputTarget) {

                         [&windowHandle](const InputTarget& inputTarget) {

services/inputflinger/dispatcher/InputDispatcher.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -554,7 +554,7 @@ private: 
    void addWindowTargetLocked(const sp<android::gui::WindowInfoHandle>& windowHandle,

    void addWindowTargetLocked(const sp<android::gui::WindowInfoHandle>& windowHandle,

                               int32_t targetFlags, BitSet32 pointerIds,

                               int32_t targetFlags, BitSet32 pointerIds,

                               std::optional<nsecs_t> firstDownTimeInTarget,

                               std::optional<nsecs_t> firstDownTimeInTarget,

                               std::vector<InputTarget>& inputTargets) REQUIRES(mLock);

                               std::vector<InputTarget>& inputTargets) const REQUIRES(mLock);

    void addGlobalMonitoringTargetsLocked(std::vector<InputTarget>& inputTargets, int32_t displayId)

    void addGlobalMonitoringTargetsLocked(std::vector<InputTarget>& inputTargets, int32_t displayId)

            REQUIRES(mLock);

            REQUIRES(mLock);

    void pokeUserActivityLocked(const EventEntry& eventEntry) REQUIRES(mLock);

    void pokeUserActivityLocked(const EventEntry& eventEntry) REQUIRES(mLock);