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

Commit f8882305 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Mark findTouchedWindowAtLocked const"

parents e23e6bb2 6ebd069c

services/inputflinger/dispatcher/InputDispatcher.cpp

+6 −5
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ sp<WindowInfoHandle> InputDispatcher::findTouchedWindowAtLocked(int32_t displayI 
                                                                int32_t y, TouchState* touchState,

                                                                bool isStylus,

                                                                bool addOutsideTargets,

                                                                bool ignoreDragWindow) {

                                                                bool ignoreDragWindow) const {

    if (addOutsideTargets && touchState == nullptr) {

        LOG_ALWAYS_FATAL("Must provide a valid touch state if adding outside targets");

    }
@@ -3984,13 +3984,14 @@ void InputDispatcher::notifyMotion(const NotifyMotionArgs* args) { 
    if (DEBUG_INBOUND_EVENT_DETAILS) {

        ALOGD("notifyMotion - id=%" PRIx32 " eventTime=%" PRId64 ", deviceId=%d, source=0x%x, "

              "displayId=%" PRId32 ", policyFlags=0x%x, "

              "action=0x%x, actionButton=0x%x, flags=0x%x, metaState=0x%x, buttonState=0x%x, "

              "action=%s, actionButton=0x%x, flags=0x%x, metaState=0x%x, buttonState=0x%x, "

              "edgeFlags=0x%x, xPrecision=%f, yPrecision=%f, xCursorPosition=%f, "

              "yCursorPosition=%f, downTime=%" PRId64,

              args->id, args->eventTime, args->deviceId, args->source, args->displayId,

              args->policyFlags, args->action, args->actionButton, args->flags, args->metaState,

              args->buttonState, args->edgeFlags, args->xPrecision, args->yPrecision,

              args->xCursorPosition, args->yCursorPosition, args->downTime);

              args->policyFlags, MotionEvent::actionToString(args->action).c_str(),

              args->actionButton, args->flags, args->metaState, args->buttonState, args->edgeFlags,

              args->xPrecision, args->yPrecision, args->xCursorPosition, args->yCursorPosition,

              args->downTime);

        for (uint32_t i = 0; i < args->pointerCount; i++) {

            ALOGD("  Pointer %d: id=%d, toolType=%d, "

                  "x=%f, y=%f, pressure=%f, size=%f, "

services/inputflinger/dispatcher/InputDispatcher.h

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ private: 


    sp<android::gui::WindowInfoHandle> findTouchedWindowAtLocked(

            int32_t displayId, int32_t x, int32_t y, TouchState* touchState, bool isStylus = false,

            bool addOutsideTargets = false, bool ignoreDragWindow = false) REQUIRES(mLock);

            bool addOutsideTargets = false, bool ignoreDragWindow = false) const REQUIRES(mLock);



    std::vector<sp<android::gui::WindowInfoHandle>> findTouchedSpyWindowsAtLocked(

            int32_t displayId, int32_t x, int32_t y, bool isStylus) const REQUIRES(mLock);