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

Commit 3a98ffe2 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix focused application handle."

parents 1453f092 a2cc28d7

services/input/InputDispatcher.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -1239,7 +1239,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        mTempTouchState.copyFrom(mTouchState);

        mTempTouchState.copyFrom(mTouchState);

    }

    }

    if (wrongDevice) {

    if (wrongDevice) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

        LOGD("Dropping event because a pointer for a different device is already down.");

        LOGD("Dropping event because a pointer for a different device is already down.");

#endif

#endif

        injectionResult = INPUT_EVENT_INJECTION_FAILED;

        injectionResult = INPUT_EVENT_INJECTION_FAILED;
@@ -1380,7 +1380,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 




        // If the pointer is not currently down, then ignore the event.

        // If the pointer is not currently down, then ignore the event.

        if (! mTempTouchState.down) {

        if (! mTempTouchState.down) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

            LOGD("Dropping event because the pointer is not down or we previously "

            LOGD("Dropping event because the pointer is not down or we previously "

                    "dropped the pointer down event.");

                    "dropped the pointer down event.");

#endif

#endif
@@ -1428,7 +1428,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
            }

            }

        }

        }

        if (! haveForegroundWindow) {

        if (! haveForegroundWindow) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

            LOGD("Dropping event because there is no touched foreground window to receive it.");

            LOGD("Dropping event because there is no touched foreground window to receive it.");

#endif

#endif

            injectionResult = INPUT_EVENT_INJECTION_FAILED;

            injectionResult = INPUT_EVENT_INJECTION_FAILED;
@@ -1445,7 +1445,7 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) {

        if (touchedWindow.targetFlags & InputTarget::FLAG_FOREGROUND) {

            // If the touched window is paused then keep waiting.

            // If the touched window is paused then keep waiting.

            if (touchedWindow.window->paused) {

            if (touchedWindow.window->paused) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

                LOGD("Waiting because touched window is paused.");

                LOGD("Waiting because touched window is paused.");

#endif

#endif

                injectionResult = handleTargetsNotReadyLocked(currentTime, entry,

                injectionResult = handleTargetsNotReadyLocked(currentTime, entry,

services/jni/com_android_server_InputManager.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -600,6 +600,7 @@ void NativeInputManager::setFocusedApplication(JNIEnv* env, jobject applicationO 
        android_server_InputApplication_toNative(env, applicationObj, &application);

        android_server_InputApplication_toNative(env, applicationObj, &application);

        if (application.inputApplicationHandle != NULL) {

        if (application.inputApplicationHandle != NULL) {

            mInputManager->getDispatcher()->setFocusedApplication(&application);

            mInputManager->getDispatcher()->setFocusedApplication(&application);

            return;

        }

        }

    }

    }

    mInputManager->getDispatcher()->setFocusedApplication(NULL);

    mInputManager->getDispatcher()->setFocusedApplication(NULL);