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

Commit 4bda0f54 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Update the usage of receiveFinishedSignal 

To match the new signature of receiveFinishedSignal api, update the
InputEventSender.

Bug: 167947340
Test: atest libinput_tests
Change-Id: I43a0f2d314560aae6f0e9e767464d0c5ad9fb62b
parent 31d065f5

core/jni/android_view_InputEventSender.cpp

+12 −16
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 


#include "core_jni_helpers.h"



using android::base::Result;



namespace android {



// Log debug messages about the dispatch cycle.
@@ -197,16 +199,9 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { 
    ScopedLocalRef<jobject> senderObj(env, NULL);

    bool skipCallbacks = false;

    for (;;) {

        uint32_t publishedSeq;

        bool handled;

        std::function<void(uint32_t seq, bool handled, nsecs_t consumeTime)> callback =

                [&publishedSeq, &handled](uint32_t inSeq, bool inHandled,

                                          nsecs_t inConsumeTime) -> void {

            publishedSeq = inSeq;

            handled = inHandled;

        };

        status_t status = mInputPublisher.receiveFinishedSignal(callback);

        if (status) {

        Result<InputPublisher::Finished> result = mInputPublisher.receiveFinishedSignal();

        if (!result.ok()) {

            const status_t status = result.error().code();

            if (status == WOULD_BLOCK) {

                return OK;

            }
@@ -215,7 +210,7 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { 
            return status;

        }



        auto it = mPublishedSeqMap.find(publishedSeq);

        auto it = mPublishedSeqMap.find(result->seq);

        if (it == mPublishedSeqMap.end()) {

            continue;

        }
@@ -226,7 +221,7 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { 
        if (kDebugDispatchCycle) {

            ALOGD("channel '%s' ~ Received finished signal, seq=%u, handled=%s, "

                  "pendingEvents=%zu.",

                    getInputChannelName().c_str(), seq, handled ? "true" : "false",

                  getInputChannelName().c_str(), seq, result->handled ? "true" : "false",

                  mPublishedSeqMap.size());

        }
@@ -242,7 +237,8 @@ status_t NativeInputEventSender::receiveFinishedSignals(JNIEnv* env) { 


            env->CallVoidMethod(senderObj.get(),

                                gInputEventSenderClassInfo.dispatchInputEventFinished,

                    jint(seq), jboolean(handled));

                                static_cast<jint>(result->seq),

                                static_cast<jboolean>(result->handled));

            if (env->ExceptionCheck()) {

                ALOGE("Exception dispatching finished signal.");

                skipCallbacks = true;