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

Commit 7d86ff46 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear spam log for INPUT_FEATURE_NO_INPUT_CHANNEL window" into rvc-dev... 

Merge "Clear spam log for INPUT_FEATURE_NO_INPUT_CHANNEL window" into rvc-dev am: 31e7a17e am: 668e5b92

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

Change-Id: I61072a59eaa3be275470b0e1f0825dc03d1a7749
parents 67757144 668e5b92

services/inputflinger/dispatcher/InputDispatcher.cpp

+6 −1
Original line number Diff line number Diff line
@@ -3569,6 +3569,10 @@ std::vector<sp<InputWindowHandle>> InputDispatcher::getWindowHandlesLocked( 


sp<InputWindowHandle> InputDispatcher::getWindowHandleLocked(

        const sp<IBinder>& windowHandleToken) const {

    if (windowHandleToken == nullptr) {

        return nullptr;

    }



    for (auto& it : mWindowHandlesByDisplay) {

        const std::vector<sp<InputWindowHandle>> windowHandles = it.second;

        for (const sp<InputWindowHandle>& windowHandle : windowHandles) {
@@ -3584,7 +3588,8 @@ bool InputDispatcher::hasWindowHandleLocked(const sp<InputWindowHandle>& windowH 
    for (auto& it : mWindowHandlesByDisplay) {

        const std::vector<sp<InputWindowHandle>> windowHandles = it.second;

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

            if (handle->getToken() == windowHandle->getToken()) {

            if (handle->getId() == windowHandle->getId() &&

                handle->getToken() == windowHandle->getToken()) {

                if (windowHandle->getInfo()->displayId != it.first) {

                    ALOGE("Found window %s in display %" PRId32

                          ", but it should belong to display %" PRId32,