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

Commit 92357f39 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Fix drag and drop (3/3)"

parents f626c1d2 4f2dd40c

services/inputflinger/InputDispatcher.cpp

+4 −9
Original line number Diff line number Diff line
@@ -3374,11 +3374,6 @@ void InputDispatcher::setInputFilterEnabled(bool enabled) { 
    mLooper->wake();

}



bool InputDispatcher::transferTouchFocus(const sp<InputChannel>& fromChannel,

        const sp<InputChannel>& toChannel) {

    return transferTouchFocus(fromChannel->getToken(), toChannel->getToken());

}



bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) {

    if (fromToken == toToken) {

#if DEBUG_FOCUS
@@ -3392,14 +3387,14 @@ bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp< 


        sp<InputWindowHandle> fromWindowHandle = getWindowHandleLocked(fromToken);

        sp<InputWindowHandle> toWindowHandle = getWindowHandleLocked(toToken);

#if DEBUG_FOCUS

        ALOGD("transferTouchFocus: fromWindowHandle=%s, toWindowHandle=%s",

            fromWindowHandle->getName().c_str(), toWindowHandle->getName().c_str());

#endif

        if (fromWindowHandle == nullptr || toWindowHandle == nullptr) {

            ALOGW("Cannot transfer focus because from or to window not found.");

            return false;

        }

#if DEBUG_FOCUS

        ALOGD("transferTouchFocus: fromWindowHandle=%s, toWindowHandle=%s",

            fromWindowHandle->getName().c_str(), toWindowHandle->getName().c_str());

#endif

        if (fromWindowHandle->getInfo()->displayId != toWindowHandle->getInfo()->displayId) {

#if DEBUG_FOCUS

            ALOGD("Cannot transfer focus because windows are on different displays.");

services/inputflinger/InputDispatcher.h

+0 −5
Original line number Diff line number Diff line
@@ -349,9 +349,6 @@ public: 
     */

    virtual bool transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken) = 0;



    virtual bool transferTouchFocus(const sp<InputChannel>& fromChannel,

            const sp<InputChannel>& toChannel) = 0;



    /* Registers input channels that may be used as targets for input events.

     * If inputWindowHandle is null, and displayId is not ADISPLAY_ID_NONE,

     * the channel will receive a copy of all input events form the specific displayId.
@@ -416,8 +413,6 @@ public: 
    virtual void setInputFilterEnabled(bool enabled);



    virtual bool transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken);

    virtual bool transferTouchFocus(const sp<InputChannel>& fromChannel,

            const sp<InputChannel>& toChannel);



    virtual status_t registerInputChannel(const sp<InputChannel>& inputChannel,

            int32_t displayId);