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

Commit bc16baec authored by David Zhao's avatar David Zhao Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect evaluation of TvMessage count" into udc-dev am:... 

Merge "Fix incorrect evaluation of TvMessage count" into udc-dev am: 4fca5c41 am: b1e0022d am: d2b7b8e0

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



Change-Id: I520dd4a8398cc910153a8d2079fabcd8bbe692f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 226c20fa d2b7b8e0

services/core/jni/tvinput/JTvInputHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ JTvInputHal::TvInputCallback::TvInputCallback(JTvInputHal* hal) { 
::ndk::ScopedAStatus JTvInputHal::TvInputCallback::notifyTvMessageEvent(

        const AidlTvMessageEvent& event) {

    const std::string DEVICE_ID_SUBTYPE = "device_id";

    if (sizeof(event.messages) > 0 && event.messages[0].subType == DEVICE_ID_SUBTYPE) {

    if (event.messages.size() > 1 && event.messages[0].subType == DEVICE_ID_SUBTYPE) {

        mHal->mLooper

                ->sendMessage(new NotifyTvMessageHandler(mHal,

                                                         TvMessageEventWrapper::createEventWrapper(