Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81afac91 authored by Brian Lindahl's avatar Brian Lindahl Committed by Automerger Merge Worker
Browse files

Merge "Differentiate between empty and unrecognizable display identification... 

Merge "Differentiate between empty and unrecognizable display identification data" into main am: c683bc5b am: 7685c407

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3101643



Change-Id: Ia40ad82c648cdf318ac04d55d820983cb7b656a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df55f52e 7685c407

libs/ui/DisplayIdentification.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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 {};

services/surfaceflinger/SurfaceFlinger.cpp

+7 −2
Original line number Diff line number Diff line
@@ -6522,12 +6522,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;

        }