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

Commit 0c17a2b2 authored by Craig Mautner's avatar Craig Mautner
Browse files

Stop consuming input on error dialogs. 

This code is no longer necessary and was preventing input from
reaching their desired windows. See bug 17648830.

Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca
parent bfd633e1

services/inputflinger/InputDispatcher.cpp

+0 −25
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ sp<InputWindowHandle> InputDispatcher::findTouchedWindowAtLocked(int32_t display 
        const InputWindowInfo* windowInfo = windowHandle->getInfo();

        if (windowInfo->displayId == displayId) {

            int32_t flags = windowInfo->layoutParamsFlags;

            int32_t privateFlags = windowInfo->layoutParamsPrivateFlags;



            if (windowInfo->visible) {

                if (!(flags & InputWindowInfo::FLAG_NOT_TOUCHABLE)) {
@@ -489,11 +488,6 @@ sp<InputWindowHandle> InputDispatcher::findTouchedWindowAtLocked(int32_t display 
                    }

                }

            }



            if (privateFlags & InputWindowInfo::PRIVATE_FLAG_SYSTEM_ERROR) {

                // Error window is on top but not visible, so touch is dropped.

                return NULL;

            }

        }

    }

    return NULL;
@@ -1190,7 +1184,6 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        int32_t y = int32_t(entry->pointerCoords[pointerIndex].

                getAxisValue(AMOTION_EVENT_AXIS_Y));

        sp<InputWindowHandle> newTouchedWindowHandle;

        sp<InputWindowHandle> topErrorWindowHandle;

        bool isTouchModal = false;



        // Traverse windows from front to back to find touched window and outside targets.
@@ -1202,13 +1195,6 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
                continue; // wrong display

            }



            int32_t privateFlags = windowInfo->layoutParamsPrivateFlags;

            if (privateFlags & InputWindowInfo::PRIVATE_FLAG_SYSTEM_ERROR) {

                if (topErrorWindowHandle == NULL) {

                    topErrorWindowHandle = windowHandle;

                }

            }



            int32_t flags = windowInfo->layoutParamsFlags;

            if (windowInfo->visible) {

                if (! (flags & InputWindowInfo::FLAG_NOT_TOUCHABLE)) {
@@ -1233,17 +1219,6 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
            }

        }



        // If there is an error window but it is not taking focus (typically because

        // it is invisible) then wait for it.  Any other focused window may in

        // fact be in ANR state.

        if (topErrorWindowHandle != NULL && newTouchedWindowHandle != topErrorWindowHandle) {

            injectionResult = handleTargetsNotReadyLocked(currentTime, entry,

                    NULL, NULL, nextWakeupTime,

                    "Waiting because a system error window is about to be displayed.");

            injectionPermission = INJECTION_PERMISSION_UNKNOWN;

            goto Unresponsive;

        }



        // Figure out whether splitting will be allowed for this window.

        if (newTouchedWindowHandle != NULL

                && newTouchedWindowHandle->getInfo()->supportsSplitTouch()) {

services/inputflinger/InputWindow.h

+0 −6
Original line number Diff line number Diff line
@@ -64,11 +64,6 @@ struct InputWindowInfo { 
        FLAG_NEEDS_MENU_KEY = 0x40000000,

    };



    // Private Window flags from WindowManager.LayoutParams

    enum {

        PRIVATE_FLAG_SYSTEM_ERROR = 0x00000100,

    };



    // Window types from WindowManager.LayoutParams

    enum {

        FIRST_APPLICATION_WINDOW = 1,
@@ -119,7 +114,6 @@ struct InputWindowInfo { 
    sp<InputChannel> inputChannel;

    String8 name;

    int32_t layoutParamsFlags;

    int32_t layoutParamsPrivateFlags;

    int32_t layoutParamsType;

    nsecs_t dispatchingTimeout;

    int32_t frameLeft;