commit 99a74b845d0b91b6879a97ab2d42afcb4884d4b1
author Nathalie Le Clair <lcnathalie@google.com> Fri Apr 21 15:51:08 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 21 15:51:08 2023 +0000
tree 979a1d7077d78aecb7805bd9d2e49698eaa66165
parent 57e4a8f1efc613504327f8936efefd5de48e7895
parent 1ef37ce89509468e0789797f032abdc74b615ef4

Merge "CEC : fix VtsHalTvCecV1_0TargetTest SendMessage test failed." am: c054e7fda9 am: 2c01719f44 am: 1ef37ce895

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2535500

Change-Id: If5df9c663e3cb36b315b82d271a5c0fc63d2d9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp

diff --git a/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp b/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp
index 7b42689..75c44b7 100644
--- a/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp
+++ b/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp
@@ -127,7 +127,15 @@
 
 TEST_P(HdmiCecTest, SendMessage) {
     CecMessage message;
-    message.initiator = CecLogicalAddress::PLAYBACK_1;
+    if (hasDeviceType(CecDeviceType::TV))
+    {
+        hdmiCec->clearLogicalAddress();
+        Return<Result> result = hdmiCec->addLogicalAddress(CecLogicalAddress::TV);
+        EXPECT_EQ(result, Result::SUCCESS);
+        message.initiator = CecLogicalAddress::TV;
+    }
+    else
+        message.initiator = CecLogicalAddress::PLAYBACK_1;
     message.destination = CecLogicalAddress::BROADCAST;
     message.body.resize(1);
     message.body[0] = 131;