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

Commit e8844d09 authored by Daniel Zheng's avatar Daniel Zheng Committed by Android (Google) Code Review
Browse files

Merge "surfaceFlinger: dump screenPartStatus" into main

parents bbe26c2a 59a484e1

libs/ui/include/ui/DisplayIdentification.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,17 @@ enum class ScreenPartStatus : uint8_t { 
    REPLACED = 2,

    REPLACED = 2,

};

};





inline std::string ScreenPartStatusToString(ScreenPartStatus screenPartStatus) {

    switch (screenPartStatus) {

        case ScreenPartStatus::ORIGINAL:

            return "ORIGINAL";

        case ScreenPartStatus::REPLACED:

            return "REPLACED";

        default:

            return "UNSUPPORTED";

    }

}



struct DisplayIdentificationInfo {

struct DisplayIdentificationInfo {

    PhysicalDisplayId id;

    PhysicalDisplayId id;

    std::string name;

    std::string name;

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -6114,7 +6114,9 @@ void SurfaceFlinger::dumpDisplayIdentificationData(std::string& result) const { 
            continue;

            continue;

        }

        }





        StringAppendF(&result, "port=%u pnpId=%s displayName=\"", port, edid->pnpId.data());

        StringAppendF(&result, "port=%u pnpId=%s screenPartStatus=%s displayName=\"", port,

                      edid->pnpId.data(),

                      android::ScreenPartStatusToString(screenPartStatus).c_str());

        result.append(edid->displayName.data(), edid->displayName.length());

        result.append(edid->displayName.data(), edid->displayName.length());

        result.append("\"\n");

        result.append("\"\n");

    }

    }