Merge "Support per-port display configs in VTS" into main (d683f7da) · Commits · e / os / android_hardware_interfaces

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+56 −22

Original line number	Diff line number	Diff line
		@@ -129,34 +129,21 @@ class GraphicsCompositionTestBase : public ::testing::Test {
		return {false, graphicBuffer};
		}

		uint64_t getStableDisplayId(int64_t display) {
		const auto& [status, identification] =
		mComposerClient->getDisplayIdentificationData(display);
		EXPECT_TRUE(status.isOk());
		// Gets the per-display XML config
		std::unique_ptr<tinyxml2::XMLDocument> getDisplayConfigXml(int64_t display) {

		if (const auto info = ::android::parseDisplayIdentificationData(
		static_cast<uint8_t>(identification.port), identification.data)) {
		return info->id.value;
		if (auto document = getDisplayConfigXmlByStableId(getStableDisplayId(display));
		document != nullptr) {
		return document;
		}

		return ::android::PhysicalDisplayId::fromPort(static_cast<uint8_t>(identification.port))
		.value;
		// Fallback to looking up a per-port config if no config exists for the full ID
		if (auto document = getDisplayConfigXmlByPort(getPort(display)); document != nullptr) {
		return document;
		}

		// Gets the per-display XML config
		std::unique_ptr<tinyxml2::XMLDocument> getDisplayConfigXml(int64_t display) {
		std::stringstream pathBuilder;
		pathBuilder << "/vendor/etc/displayconfig/display_id_" << getStableDisplayId(display)
		<< ".xml";
		const std::string path = pathBuilder.str();
		auto document = std::make_unique<tinyxml2::XMLDocument>();
		const tinyxml2::XMLError error = document->LoadFile(path.c_str());
		if (error == tinyxml2::XML_SUCCESS) {
		return document;
		} else {
		return nullptr;
		}
		}

		// Gets the max display brightness for this display.
		// If the display config xml does not exist, then assume that the display is not well-configured
		@@ -256,6 +243,53 @@ class GraphicsCompositionTestBase : public ::testing::Test {
		}
		}
		}

		uint8_t getPort(int64_t display) {
		const auto& [status, identification] =
		mComposerClient->getDisplayIdentificationData(display);
		EXPECT_TRUE(status.isOk());
		return static_cast<uint8_t>(identification.port);
		}

		uint64_t getStableDisplayId(int64_t display) {
		const auto& [status, identification] =
		mComposerClient->getDisplayIdentificationData(display);
		EXPECT_TRUE(status.isOk());

		if (const auto info = ::android::parseDisplayIdentificationData(
		static_cast<uint8_t>(identification.port), identification.data)) {
		return info->id.value;
		}

		return ::android::PhysicalDisplayId::fromPort(static_cast<uint8_t>(identification.port))
		.value;
		}

		std::unique_ptr<tinyxml2::XMLDocument> loadXml(const std::string& path) {
		auto document = std::make_unique<tinyxml2::XMLDocument>();
		const tinyxml2::XMLError error = document->LoadFile(path.c_str());
		if (error != tinyxml2::XML_SUCCESS) {
		ALOGD("%s: Failed to load config file: %s", __func__, path.c_str());
		return nullptr;
		}

		ALOGD("%s: Successfully loaded config file: %s", __func__, path.c_str());
		return document;
		}

		std::unique_ptr<tinyxml2::XMLDocument> getDisplayConfigXmlByPort(uint8_t port) {
		std::stringstream pathBuilder;
		pathBuilder << "/vendor/etc/displayconfig/display_port_" << static_cast<uint32_t>(port)
		<< ".xml";
		return loadXml(pathBuilder.str());
		}

		std::unique_ptr<tinyxml2::XMLDocument> getDisplayConfigXmlByStableId(uint64_t stableId) {
		std::stringstream pathBuilder;
		pathBuilder << "/vendor/etc/displayconfig/display_id_" << stableId
		<< ".xml";
		return loadXml(pathBuilder.str());
		}
		};

		class GraphicsCompositionTest : public GraphicsCompositionTestBase,