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

Commit 92693bce authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2 

* commit '32b7bcc8':
  Fix focused application handle. (DO NOT MERGE)
parents 54bd4cae 32b7bcc8

services/input/InputDispatcher.cpp

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

    }

    if (wrongDevice) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

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

#endif

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


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

        if (! mTempTouchState.down) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

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

                    "dropped the pointer down event.");

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

        }

        if (! haveForegroundWindow) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

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

#endif

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

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

            if (touchedWindow.window->paused) {

#if DEBUG_INPUT_DISPATCHER_POLICY

#if DEBUG_FOCUS

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

#endif

                injectionResult = handleTargetsNotReadyLocked(currentTime, entry,

services/jni/com_android_server_InputManager.cpp

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

        if (application.inputApplicationHandle != NULL) {

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

            return;

        }

    }

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