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

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

Merge "Mark slipWallpaperTouch as const" into udc-dev am: 6689c821 

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



Change-Id: I86971792c25d01b6ec3a15b21450562a008d377a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents caa66e34 6689c821

services/inputflinger/dispatcher/InputDispatcher.cpp

+3 −6
Original line number Original line Diff line number Diff line
@@ -2203,7 +2203,7 @@ std::vector<InputTarget> InputDispatcher::findTouchedWindowTargetsLocked( 
    // event injection will be allowed.

    // event injection will be allowed.

    const int32_t displayId = entry.displayId;

    const int32_t displayId = entry.displayId;

    const int32_t action = entry.action;

    const int32_t action = entry.action;

    const int32_t maskedAction = action & AMOTION_EVENT_ACTION_MASK;

    const int32_t maskedAction = MotionEvent::getActionMasked(action);





    // Update the touch state as needed based on the properties of the touch event.

    // Update the touch state as needed based on the properties of the touch event.

    outInjectionResult = InputEventInjectionResult::PENDING;

    outInjectionResult = InputEventInjectionResult::PENDING;
@@ -2704,9 +2704,6 @@ void InputDispatcher::addDragEventLocked(const MotionEntry& entry) { 




    if (uint32_t(pointerIndex) == entry.pointerCount) {

    if (uint32_t(pointerIndex) == entry.pointerCount) {

        LOG_ALWAYS_FATAL("Should find a valid pointer index by id %d", mDragState->pointerId);

        LOG_ALWAYS_FATAL("Should find a valid pointer index by id %d", mDragState->pointerId);

        sendDropWindowCommandLocked(nullptr, 0, 0);

        mDragState.reset();

        return;

    }

    }





    const int32_t maskedAction = entry.action & AMOTION_EVENT_ACTION_MASK;

    const int32_t maskedAction = entry.action & AMOTION_EVENT_ACTION_MASK;
@@ -3611,7 +3608,7 @@ std::array<uint8_t, 32> InputDispatcher::sign(const VerifiedInputEvent& event) c 




const std::array<uint8_t, 32> InputDispatcher::getSignature(

const std::array<uint8_t, 32> InputDispatcher::getSignature(

        const MotionEntry& motionEntry, const DispatchEntry& dispatchEntry) const {

        const MotionEntry& motionEntry, const DispatchEntry& dispatchEntry) const {

    const int32_t actionMasked = dispatchEntry.resolvedAction & AMOTION_EVENT_ACTION_MASK;

    const int32_t actionMasked = MotionEvent::getActionMasked(dispatchEntry.resolvedAction);

    if (actionMasked != AMOTION_EVENT_ACTION_UP && actionMasked != AMOTION_EVENT_ACTION_DOWN) {

    if (actionMasked != AMOTION_EVENT_ACTION_UP && actionMasked != AMOTION_EVENT_ACTION_DOWN) {

        // Only sign events up and down events as the purely move events

        // Only sign events up and down events as the purely move events

        // are tied to their up/down counterparts so signing would be redundant.

        // are tied to their up/down counterparts so signing would be redundant.
@@ -6665,7 +6662,7 @@ void InputDispatcher::slipWallpaperTouch(ftl::Flags<InputTarget::Flags> targetFl 
                                         const sp<WindowInfoHandle>& oldWindowHandle,

                                         const sp<WindowInfoHandle>& oldWindowHandle,

                                         const sp<WindowInfoHandle>& newWindowHandle,

                                         const sp<WindowInfoHandle>& newWindowHandle,

                                         TouchState& state, int32_t pointerId,

                                         TouchState& state, int32_t pointerId,

                                         std::vector<InputTarget>& targets) {

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

    std::bitset<MAX_POINTER_ID + 1> pointerIds;

    std::bitset<MAX_POINTER_ID + 1> pointerIds;

    pointerIds.set(pointerId);

    pointerIds.set(pointerId);

    const bool oldHasWallpaper = oldWindowHandle->getInfo()->inputConfig.test(

    const bool oldHasWallpaper = oldWindowHandle->getInfo()->inputConfig.test(

services/inputflinger/dispatcher/InputDispatcher.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -707,8 +707,8 @@ private: 
    void slipWallpaperTouch(ftl::Flags<InputTarget::Flags> targetFlags,

    void slipWallpaperTouch(ftl::Flags<InputTarget::Flags> targetFlags,

                            const sp<android::gui::WindowInfoHandle>& oldWindowHandle,

                            const sp<android::gui::WindowInfoHandle>& oldWindowHandle,

                            const sp<android::gui::WindowInfoHandle>& newWindowHandle,

                            const sp<android::gui::WindowInfoHandle>& newWindowHandle,

                            TouchState& state, int32_t pointerId, std::vector<InputTarget>& targets)

                            TouchState& state, int32_t pointerId,

            REQUIRES(mLock);

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

    void transferWallpaperTouch(ftl::Flags<InputTarget::Flags> oldTargetFlags,

    void transferWallpaperTouch(ftl::Flags<InputTarget::Flags> oldTargetFlags,

                                ftl::Flags<InputTarget::Flags> newTargetFlags,

                                ftl::Flags<InputTarget::Flags> newTargetFlags,

                                const sp<android::gui::WindowInfoHandle> fromWindowHandle,

                                const sp<android::gui::WindowInfoHandle> fromWindowHandle,