From 7493bbc999eb653deb36773ca1ff1b6d5877806a Mon Sep 17 00:00:00 2001 From: Dorin Drimus Date: Thu, 23 Feb 2023 17:06:58 +0000 Subject: [PATCH] Fix VtsHalGraphicsComposer3_TargetTest / GetOverlaySupport Test case is for composer starting with version 2 API, but the test case doesn't check version, so it fails for version 1 API. Bug: 267565265 Test: 1. Push VtsHalGraphicsComposer3_TargetTest to device 2. Run VtsHalGraphicsComposer3_TargetTest Test Command: chmod 777 data/VtsHalGraphicsComposer3_TargetTest ./data/VtsHalGraphicsComposer3_TargetTest Change-Id: I7bf37061aba84dfdfea5fc9dda5a300a1e5ec680 --- .../aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp index 70c4e4cf39..4974e71636 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp @@ -874,6 +874,13 @@ TEST_P(GraphicsComposerAidlTest, GetDisplayName) { } TEST_P(GraphicsComposerAidlTest, GetOverlaySupport) { + const auto& [versionStatus, version] = mComposerClient->getInterfaceVersion(); + ASSERT_TRUE(versionStatus.isOk()); + if (version == 1) { + GTEST_SUCCEED() << "Device does not support the new API for overlay support"; + return; + } + const auto& [status, properties] = mComposerClient->getOverlaySupport(); if (!status.isOk() && status.getExceptionCode() == EX_SERVICE_SPECIFIC && status.getServiceSpecificError() == IComposerClient::EX_UNSUPPORTED) {