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

Commit a8ed856a authored by Jeff Brown's avatar Jeff Brown
Browse files

Improve the input policy handling a bit. 

Fixed some issues with Monkeys turning off their own screens.  Ook ook!
Added some more comments to explain what's going on.

Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
parent 3d3429e6

libs/ui/InputDispatcher.cpp

+6 −8
Original line number Diff line number Diff line
@@ -432,10 +432,9 @@ void InputDispatcher::dropInboundEventLocked(EventEntry* entry, DropReason dropR 
    switch (dropReason) {

    case DROP_REASON_POLICY:

#if DEBUG_INBOUND_EVENT_DETAILS

        LOGD("Dropped event because policy requested that it not be delivered to the application.");

        LOGD("Dropped event because policy consumed it.");

#endif

        reason = "inbound event was dropped because the policy requested that it not be "

                "delivered to the application";

        reason = "inbound event was dropped because the policy consumed it";

        break;

    case DROP_REASON_DISABLED:

        LOGI("Dropped event because input dispatch is disabled.");
@@ -625,15 +624,13 @@ bool InputDispatcher::dispatchKeyLocked( 
        if (*dropReason == DROP_REASON_NOT_DROPPED) {

            *dropReason = DROP_REASON_POLICY;

        }

        resetTargetsLocked();

        setInjectionResultLocked(entry, INPUT_EVENT_INJECTION_SUCCEEDED);

        return true;

    }



    // Clean up if dropping the event.

    if (*dropReason != DROP_REASON_NOT_DROPPED) {

        resetTargetsLocked();

        setInjectionResultLocked(entry, INPUT_EVENT_INJECTION_FAILED);

        setInjectionResultLocked(entry, *dropReason == DROP_REASON_POLICY

                ? INPUT_EVENT_INJECTION_SUCCEEDED : INPUT_EVENT_INJECTION_FAILED);

        return true;

    }
@@ -713,7 +710,8 @@ bool InputDispatcher::dispatchMotionLocked( 
    // Clean up if dropping the event.

    if (*dropReason != DROP_REASON_NOT_DROPPED) {

        resetTargetsLocked();

        setInjectionResultLocked(entry, INPUT_EVENT_INJECTION_FAILED);

        setInjectionResultLocked(entry, *dropReason == DROP_REASON_POLICY

                ? INPUT_EVENT_INJECTION_SUCCEEDED : INPUT_EVENT_INJECTION_FAILED);

        return true;

    }