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

Commit d924b95a authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Make addGestureMonitors static am: e0fb6bdd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11887941

Change-Id: Id0cf096c5b629461aa853bab0d469cee0c84e9a2
parents c6f30115 e0fb6bdd

services/inputflinger/dispatcher/InputDispatcher.cpp

+22 −28
Original line number Diff line number Diff line
@@ -328,6 +328,18 @@ static std::unique_ptr<DispatchEntry> createDispatchEntry(const InputTarget& inp 
    return dispatchEntry;

}



static void addGestureMonitors(const std::vector<Monitor>& monitors,

                               std::vector<TouchedMonitor>& outTouchedMonitors, float xOffset = 0,

                               float yOffset = 0) {

    if (monitors.empty()) {

        return;

    }

    outTouchedMonitors.reserve(monitors.size() + outTouchedMonitors.size());

    for (const Monitor& monitor : monitors) {

        outTouchedMonitors.emplace_back(monitor, xOffset, yOffset);

    }

}



static std::array<uint8_t, 128> getRandomKey() {

    std::array<uint8_t, 128> key;

    if (RAND_bytes(key.data(), key.size()) != 1) {
@@ -752,7 +764,7 @@ sp<InputWindowHandle> InputDispatcher::findTouchedWindowAtLocked(int32_t display 
}



std::vector<TouchedMonitor> InputDispatcher::findTouchedGestureMonitorsLocked(

        int32_t displayId, const std::vector<sp<InputWindowHandle>>& portalWindows) {

        int32_t displayId, const std::vector<sp<InputWindowHandle>>& portalWindows) const {

    std::vector<TouchedMonitor> touchedMonitors;



    std::vector<Monitor> monitors = getValueByKey(mGestureMonitorsByDisplay, displayId);
@@ -766,18 +778,6 @@ std::vector<TouchedMonitor> InputDispatcher::findTouchedGestureMonitorsLocked( 
    return touchedMonitors;

}



void InputDispatcher::addGestureMonitors(const std::vector<Monitor>& monitors,

                                         std::vector<TouchedMonitor>& outTouchedMonitors,

                                         float xOffset, float yOffset) {

    if (monitors.empty()) {

        return;

    }

    outTouchedMonitors.reserve(monitors.size() + outTouchedMonitors.size());

    for (const Monitor& monitor : monitors) {

        outTouchedMonitors.emplace_back(monitor, xOffset, yOffset);

    }

}



void InputDispatcher::dropInboundEventLocked(const EventEntry& entry, DropReason dropReason) {

    const char* reason;

    switch (dropReason) {
@@ -1508,11 +1508,9 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
    if (newGesture) {

        bool down = maskedAction == AMOTION_EVENT_ACTION_DOWN;

        if (switchedDevice && mTempTouchState.down && !down && !isHoverAction) {

            if (DEBUG_FOCUS) {

                ALOGD("Dropping event because a pointer for a different device is already down "

            ALOGI("Dropping event because a pointer for a different device is already down "

                  "in display %" PRId32,

                  displayId);

            }

            // TODO: test multiple simultaneous input streams.

            injectionResult = INPUT_EVENT_INJECTION_FAILED;

            switchedDevice = false;
@@ -1526,11 +1524,9 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        mTempTouchState.displayId = displayId;

        isSplit = false;

    } else if (switchedDevice && maskedAction == AMOTION_EVENT_ACTION_MOVE) {

        if (DEBUG_FOCUS) {

        ALOGI("Dropping move event because a pointer for a different device is already active "

              "in display %" PRId32,

              displayId);

        }

        // TODO: test multiple simultaneous input streams.

        injectionResult = INPUT_EVENT_INJECTION_PERMISSION_DENIED;

        switchedDevice = false;
@@ -1714,11 +1710,9 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        }

        bool hasGestureMonitor = !mTempTouchState.gestureMonitors.empty();

        if (!haveForegroundWindow && !hasGestureMonitor) {

            if (DEBUG_FOCUS) {

                ALOGD("Dropping event because there is no touched foreground window in display "

            ALOGI("Dropping event because there is no touched foreground window in display "

                  "%" PRId32 " or gesture monitor to receive it.",

                  displayId);

            }

            injectionResult = INPUT_EVENT_INJECTION_FAILED;

            goto Failed;

        }

services/inputflinger/dispatcher/InputDispatcher.h

+1 −4
Original line number Diff line number Diff line
@@ -378,11 +378,8 @@ private: 
                                           nsecs_t* nextWakeupTime,

                                           bool* outConflictingPointerActions) REQUIRES(mLock);

    std::vector<TouchedMonitor> findTouchedGestureMonitorsLocked(

            int32_t displayId, const std::vector<sp<InputWindowHandle>>& portalWindows)

            int32_t displayId, const std::vector<sp<InputWindowHandle>>& portalWindows) const

            REQUIRES(mLock);

    void addGestureMonitors(const std::vector<Monitor>& monitors,

                            std::vector<TouchedMonitor>& outTouchedMonitors, float xOffset = 0,

                            float yOffset = 0);



    void addWindowTargetLocked(const sp<InputWindowHandle>& windowHandle, int32_t targetFlags,

                               BitSet32 pointerIds, std::vector<InputTarget>& inputTargets)