From 8a96ef91b59f3fb422f035fca831cc4515fbba6d Mon Sep 17 00:00:00 2001
From: Brian Lindahl <blindahl@google.com>
Date: Fri, 24 May 2024 14:46:29 +0000
Subject: Differentiate between empty and unrecognizable display identification
 data

Test: system boots with no display identification error logs
Bug: 220045335
Change-Id: I6efa1daf523b17ea56f4a4b9e842d663804e1c15
---
 libs/ui/DisplayIdentification.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libs/ui/DisplayIdentification.cpp')

diff --git a/libs/ui/DisplayIdentification.cpp b/libs/ui/DisplayIdentification.cpp
index 82e5427317..ed7f1930aa 100644
--- a/libs/ui/DisplayIdentification.cpp
+++ b/libs/ui/DisplayIdentification.cpp
@@ -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 {};
-- 
cgit v1.2.3-59-g8ed1b