diff options
author | 2024-05-24 20:15:26 +0000 | |
---|---|---|
committer | 2024-05-24 20:15:26 +0000 | |
commit | 81afac912242a9914f2e7edc290f7e346e96e148 (patch) | |
tree | 4f43d5fad551e51b7b26fc473adbcec8700fbfe9 /libs/ui/DisplayIdentification.cpp | |
parent | df55f52e05eaac908ac93e09e7ae95148d9a0006 (diff) | |
parent | 7685c4073fb2d6b50dab2b8df9dda055c0aabab0 (diff) |
Merge "Differentiate between empty and unrecognizable display identification data" into main am: c683bc5b94 am: 7685c4073f
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3101643
Change-Id: Ia40ad82c648cdf318ac04d55d820983cb7b656a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/DisplayIdentification.cpp')
-rw-r--r-- | libs/ui/DisplayIdentification.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/ui/DisplayIdentification.cpp b/libs/ui/DisplayIdentification.cpp index 0908ae85a8..e5af7406ed 100644 --- a/libs/ui/DisplayIdentification.cpp +++ b/libs/ui/DisplayIdentification.cpp @@ -320,6 +320,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 {}; |