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

Commit 94bfc4b1 authored by Arpit Singh's avatar Arpit Singh
Browse files

[1/n InputDispatcher refactor] Rename getWindowHandleLocked 

There are two overloded methods with name getWindowHandleLocked one of
which is actually used to get the updated value of the same WindowHandle
if exists.

This CL renames the method to avoid confusion:
From: sp<WindowInfoHandle> getWindowHandle(
				const sp<WindowInfoHandle>&handle);
To: sp<android::gui::WindowInfoHandle> getUpdatedWindowHandle(
		const sp<android::gui::WindowInfoHandle>& handle);

Bug: 367661487
Bug: 245989146
Test: atest inputflinger_tests
Flag: EXEMPT refactor
Change-Id: Id038603636ea3643b5301d187fe07ed02fcea839
parent def8ff1b

services/inputflinger/dispatcher/InputDispatcher.cpp

+5 −6
Original line number Diff line number Diff line
@@ -5218,8 +5218,7 @@ sp<WindowInfoHandle> InputDispatcher::getWindowHandleLocked( 
    return nullptr;

}



sp<WindowInfoHandle> InputDispatcher::getWindowHandleLocked(

        const sp<WindowInfoHandle>& windowHandle) const {

bool InputDispatcher::isWindowPresentLocked(const sp<WindowInfoHandle>& windowHandle) const {

    for (const auto& [displayId, windowHandles] : mWindowHandlesByDisplay) {

        for (const sp<WindowInfoHandle>& handle : windowHandles) {

            if (handle->getId() == windowHandle->getId() &&
@@ -5230,11 +5229,11 @@ sp<WindowInfoHandle> InputDispatcher::getWindowHandleLocked( 
                          windowHandle->getName().c_str(), displayId.toString().c_str(),

                          windowHandle->getInfo()->displayId.toString().c_str());

                }

                return handle;

                return true;

            }

        }

    }

    return nullptr;

    return false;

}



sp<WindowInfoHandle> InputDispatcher::getFocusedWindowHandleLocked(
@@ -5429,7 +5428,7 @@ void InputDispatcher::setInputWindowsLocked( 
        TouchState& state = it->second;

        for (size_t i = 0; i < state.windows.size();) {

            TouchedWindow& touchedWindow = state.windows[i];

            if (getWindowHandleLocked(touchedWindow.windowHandle) != nullptr) {

            if (isWindowPresentLocked(touchedWindow.windowHandle)) {

                i++;

                continue;

            }
@@ -5495,7 +5494,7 @@ void InputDispatcher::setInputWindowsLocked( 
    // Otherwise, they might stick around until the window handle is destroyed

    // which might not happen until the next GC.

    for (const sp<WindowInfoHandle>& oldWindowHandle : oldWindowHandles) {

        if (getWindowHandleLocked(oldWindowHandle) == nullptr) {

        if (!isWindowPresentLocked(oldWindowHandle)) {

            if (DEBUG_FOCUS) {

                ALOGD("Window went away: %s", oldWindowHandle->getName().c_str());

            }

services/inputflinger/dispatcher/InputDispatcher.h

+2 −2
Original line number Diff line number Diff line
@@ -384,8 +384,8 @@ private: 
    sp<android::gui::WindowInfoHandle> getWindowHandleLocked(

            const sp<IBinder>& windowHandleToken,

            std::optional<ui::LogicalDisplayId> displayId = {}) const REQUIRES(mLock);

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

            const sp<android::gui::WindowInfoHandle>& windowHandle) const REQUIRES(mLock);

    bool isWindowPresentLocked(const sp<android::gui::WindowInfoHandle>& windowHandle) const

            REQUIRES(mLock);

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

            ui::LogicalDisplayId displayId) const REQUIRES(mLock);

    bool canWindowReceiveMotionLocked(const sp<android::gui::WindowInfoHandle>& window,