Merge "Differentiate between empty and unrecognizable display identification data" into main (c683bc5b) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/ui/DisplayIdentification.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,11 @@ std::optional<PnpId> getPnpId(PhysicalDisplayId displayId) {

		std::optional<DisplayIdentificationInfo> parseDisplayIdentificationData(
		uint8_t port, const DisplayIdentificationData& data) {
		if (data.empty()) {
		ALOGI("Display identification data is empty.");
		return {};
		}

		if (!isEdid(data)) {
		ALOGE("Display identification data has unknown format.");
		return {};

+7 −2

Original line number	Diff line number	Diff line
		@@ -6270,12 +6270,17 @@ void SurfaceFlinger::dumpDisplayIdentificationData(std::string& result) const {
		uint8_t port;
		DisplayIdentificationData data;
		if (!getHwComposer().getDisplayIdentificationData(*hwcDisplayId, &port, &data)) {
		result.append("no identification data\n");
		result.append("no display identification data\n");
		continue;
		}

		if (data.empty()) {
		result.append("empty display identification data\n");
		continue;
		}

		if (!isEdid(data)) {
		result.append("unknown identification data\n");
		result.append("unknown format for display identification data\n");
		continue;
		}