commit 6ea86e5aaaecf5f7ca3243b66e76d2f63aeb36fd
author Michal Olech <molech@google.com> Tue Mar 30 13:18:10 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 30 13:18:10 2021 +0000
tree 2e1688c33bd62a47aa76ca6cf24dbb4b0f3707a5
parent 8d428d1dcb405610b30157489e4e5389989ea688
parent 87af3e99ff1a1cc9c16dc8b19554beaaad08c443

Merge changes from topic "vts_cec_10" am: 293d67a425 am: 2a8959d969 am: 236a29ea05 am: 87af3e99ff

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

Change-Id: I0631b6a66c5545218525d78917e0b055017262a8

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 9cd6884..7b42689 100644
--- a/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp
+++ b/tv/cec/1.0/vts/functional/VtsHalTvCecV1_0TargetTest.cpp
@@ -43,6 +43,7 @@
 
 #define CEC_VERSION 0x05
 #define INCORRECT_VENDOR_ID 0x00
+#define TV_PHYSICAL_ADDRESS 0x0000
 
 // The main test class for TV CEC HAL.
 class HdmiCecTest : public ::testing::TestWithParam<std::string> {
@@ -110,6 +111,20 @@
     EXPECT_EQ(ret, Result::SUCCESS);
 }
 
+TEST_P(HdmiCecTest, PhysicalAddress) {
+    Result result;
+    uint16_t addr;
+    Return<void> ret = hdmiCec->getPhysicalAddress([&result, &addr](Result res, uint16_t paddr) {
+        result = res;
+        addr = paddr;
+    });
+    EXPECT_TRUE(ret.isOk());
+    EXPECT_EQ(result, Result::SUCCESS);
+    if (!hasDeviceType(CecDeviceType::TV)) {
+        EXPECT_NE(addr, TV_PHYSICAL_ADDRESS);
+    }
+}
+
 TEST_P(HdmiCecTest, SendMessage) {
     CecMessage message;
     message.initiator = CecLogicalAddress::PLAYBACK_1;