commit b7b9a4f51b8971457d7703456733fe8eb993c586
author Ady Abraham <adyabr@google.com> Thu Jan 25 15:57:24 2024 -0800
committer Ady Abraham <adyabr@google.com> Thu Jan 25 15:57:36 2024 -0800
tree 5996c8e798b0728cd2397de6dcf29afe83836b28
parent 07116b9563c8a262b1960d84247d18260ab6245d

SF: dump HAL interface version

Test: presubmit
Change-Id: I826e07b8acca5bb4576b73b3a49f3c35e1db934b

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

diff --git a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
index 64a8ae7..17f6f31 100644
--- a/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp
@@ -330,7 +330,11 @@
 
     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

diff --git a/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp b/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
index c4ff9cc..12ab2c2 100644
--- a/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp
@@ -291,6 +291,7 @@
 
 std::string HidlComposer::dumpDebugInfo() {
     std::string info;
+    info += std::string(mComposer->descriptor) + "\n";
     mComposer->dumpDebugInfo([&](const auto& tmpInfo) { info = tmpInfo.c_str(); });
 
     return info;