commit 5d7de5f8e6f41f59e04f9b589a0165193a37c1ad
author Dominik Laskowski <domlaskowski@google.com> Thu Nov 03 12:38:32 2022 -0400
committer Dominik Laskowski <domlaskowski@google.com> Fri Nov 04 14:08:56 2022 -0400
tree 07a9998f60ddd2ce184e47dd10864adf50fa5b06
parent 59db956b74a09712b3289316c40eae19c4cf2279

SF: Clean up dumpsys for displays

Remove DisplayDevice::getDebugName. Add Dumper::Section to automate
indented sections with a heading.

Bug: 241285876
Test: dumpsys SurfaceFlinger --displays
Change-Id: I21a8e98bf26163e374810f0afbe649e694e5dda6

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 864245a..bc19faf 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -54,6 +54,7 @@
 #include <cutils/compiler.h>
 #include <cutils/properties.h>
 #include <ftl/algorithm.h>
+#include <ftl/concat.h>
 #include <ftl/fake_guard.h>
 #include <ftl/future.h>
 #include <ftl/unit.h>
@@ -3264,7 +3265,7 @@
 
                 ALOGE_IF(error != NO_ERROR,
                          "Error setting display brightness for display %s: %d (%s)",
-                         display->getDebugName().c_str(), error, strerror(error));
+                         to_string(display->getId()).c_str(), error, strerror(error));
             }
             display->persistBrightness(needsComposite);
         }
@@ -4929,19 +4930,21 @@
     utils::Dumper dumper{result};
 
     for (const auto& [id, display] : mPhysicalDisplays) {
+        utils::Dumper::Section section(dumper, ftl::Concat("Display ", id.value).str());
+
+        display.snapshot().dump(dumper);
+
         if (const auto device = getDisplayDeviceLocked(id)) {
             device->dump(dumper);
         }
-
-        utils::Dumper::Indent indent(dumper);
-        display.snapshot().dump(dumper);
-        dumper.eol();
     }
 
     for (const auto& [token, display] : mDisplays) {
         if (display->isVirtual()) {
+            const auto displayId = display->getId();
+            utils::Dumper::Section section(dumper,
+                                           ftl::Concat("Virtual Display ", displayId.value).str());
             display->dump(dumper);
-            dumper.eol();
         }
     }
 }