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

Commit b6957c6c authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Revert "Update the usage of receiveFinishedSignal" 

Revert "Use Result<InputPublisher::Finished> instead of callback"

Revert submission 13780058-receiveFinishedSignal

Reason for revert:
Caused severe delay in back navigation on IME-focusable window.

Reverted Changes:
I301c6e9c3:Use Result<InputPublisher::Finished> instead of ca...
I43a0f2d31:Update the usage of receiveFinishedSignal

Bug: 167947340
Fix: 182514338
Test: Manually verified as follows:
 1. Set up the device as "Set up offline" mode.
 2. adb shell am start -n com.google.android.dialer/.extensions.GoogleDialtactsActivity
 3. On one terminal, run adb logcat -s InputMethodManager:*
 4. On another terminal, run adb shell input keyevent 4
 5. Make sure that the following message is not shown.
  "Timeout waiting for IME to handle input event after 2500 ms"

Change-Id: Idb3a44b4a920b1482375e26466cd81e3877f3898
parent 4bda0f54

core/jni/android_view_InputEventSender.cpp

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


#include "core_jni_helpers.h"



using android::base::Result;



namespace android {



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

    bool skipCallbacks = false;

    for (;;) {

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

        if (!result.ok()) {

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

        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) {

            if (status == WOULD_BLOCK) {

                return OK;

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

        }



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

        auto it = mPublishedSeqMap.find(publishedSeq);

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

            continue;

        }
@@ -221,7 +226,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, result->handled ? "true" : "false",

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

                    mPublishedSeqMap.size());

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


            env->CallVoidMethod(senderObj.get(),

                    gInputEventSenderClassInfo.dispatchInputEventFinished,

                                static_cast<jint>(result->seq),

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

                    jint(seq), jboolean(handled));

            if (env->ExceptionCheck()) {

                ALOGE("Exception dispatching finished signal.");

                skipCallbacks = true;