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

Commit d5bfd321 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: dump HAL interface version" into main

parents 05e3113c b7b9a4f5

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+5 −1
Original line number Diff line number Diff line
@@ -330,7 +330,11 @@ std::string AidlComposer::dumpDebugInfo() { 


    t.join();

    close(pipefds[0]);

    return str;



    std::string hash;

    mAidlComposer->getInterfaceHash(&hash);

    return std::string(mAidlComposer->descriptor) +

            " version:" + std::to_string(mComposerInterfaceVersion) + " hash:" + hash + str;

}



void AidlComposer::registerCallback(HWC2::ComposerCallback& callback) {

services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ std::vector<Capability> HidlComposer::getCapabilities() { 


std::string HidlComposer::dumpDebugInfo() {

    std::string info;

    info += std::string(mComposer->descriptor) + "\n";

    mComposer->dumpDebugInfo([&](const auto& tmpInfo) { info = tmpInfo.c_str(); });



    return info;