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

Commit 45251156 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "input jni: don't depend on unique_fd cast to int" into main am:... 

Merge "input jni: don't depend on unique_fd cast to int" into main am: 47cf4f16 am: 994cbc04 am: b291a9ff

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2835674



Change-Id: Ia84b28d79a2a7b2d80e43bc7eef64898ce62063f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79faee96 b291a9ff

core/jni/android_view_InputEventReceiver.cpp

+3 −3
Original line number Diff line number Diff line
@@ -184,11 +184,11 @@ status_t NativeInputEventReceiver::reportTimeline(int32_t inputEventId, nsecs_t 
void NativeInputEventReceiver::setFdEvents(int events) {

    if (mFdEvents != events) {

        mFdEvents = events;

        int fd = mInputConsumer.getChannel()->getFd();

        auto&& fd = mInputConsumer.getChannel()->getFd();

        if (events) {

            mMessageQueue->getLooper()->addFd(fd, 0, events, this, nullptr);

            mMessageQueue->getLooper()->addFd(fd.get(), 0, events, this, nullptr);

        } else {

            mMessageQueue->getLooper()->removeFd(fd);

            mMessageQueue->getLooper()->removeFd(fd.get());

        }

    }

}

core/jni/android_view_InputEventSender.cpp

+3 −3
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ NativeInputEventSender::~NativeInputEventSender() { 
}



status_t NativeInputEventSender::initialize() {

    int receiveFd = mInputPublisher.getChannel()->getFd();

    mMessageQueue->getLooper()->addFd(receiveFd, 0, ALOOPER_EVENT_INPUT, this, NULL);

    auto&& receiveFd = mInputPublisher.getChannel()->getFd();

    mMessageQueue->getLooper()->addFd(receiveFd.get(), 0, ALOOPER_EVENT_INPUT, this, NULL);

    return OK;

}
@@ -112,7 +112,7 @@ void NativeInputEventSender::dispose() { 
        LOG(DEBUG) << "channel '" << getInputChannelName() << "' ~ Disposing input event sender.";

    }



    mMessageQueue->getLooper()->removeFd(mInputPublisher.getChannel()->getFd());

    mMessageQueue->getLooper()->removeFd(mInputPublisher.getChannel()->getFd().get());

}



status_t NativeInputEventSender::sendKeyEvent(uint32_t seq, const KeyEvent* event) {