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

Commit 8a96ef91 authored by Brian Lindahl's avatar Brian Lindahl
Browse files

Differentiate between empty and unrecognizable display identification 

data

Test: system boots with no display identification error logs
Bug: 220045335
Change-Id: I6efa1daf523b17ea56f4a4b9e842d663804e1c15
parent dbecfa8c

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 {};

services/surfaceflinger/SurfaceFlinger.cpp

+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;

        }