From f43fef0a564f16d334332b68c74c514ec37d7bda Mon Sep 17 00:00:00 2001 From: David Zhao Date: Fri, 12 May 2023 11:43:37 -0700 Subject: [PATCH] Fix incorrect evaluation of TvMessage count Bug: 278628657 Test: atest TvInputServiceTest Change-Id: Ica32ffc82ec1f6850df113397ed9bd5f555eaf58 --- services/core/jni/tvinput/JTvInputHal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/jni/tvinput/JTvInputHal.cpp b/services/core/jni/tvinput/JTvInputHal.cpp index c494044e8e183..a3eb3906cc653 100644 --- a/services/core/jni/tvinput/JTvInputHal.cpp +++ b/services/core/jni/tvinput/JTvInputHal.cpp @@ -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(