From 1876e2eac0b9fb79c1633b0386d72938fbc3051d Mon Sep 17 00:00:00 2001 From: Marin Shalamanov Date: Fri, 4 Dec 2020 13:23:59 +0100 Subject: SF: Fix formatting of the layers table in dumpsys Bug: 161776961 Test: adb shell dumpsys SurfaceFlinger Change-Id: If5193f75cc03eebf3d06897bd6856c732886377c --- services/surfaceflinger/Layer.cpp | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 949227b119..7e7f9fc452 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -74,6 +74,9 @@ #define DEBUG_RESIZE 0 namespace android { +namespace { +constexpr int kDumpTableRowLength = 159; +} // namespace using base::StringAppendF; using namespace android::flag_operators; @@ -1622,11 +1625,8 @@ LayerDebugInfo Layer::getLayerDebugInfo(const DisplayDevice* display) const { } void Layer::miniDumpHeader(std::string& result) { - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------\n"); + result.append(kDumpTableRowLength, '-'); + result.append("\n"); result.append(" Layer name\n"); result.append(" Z | "); result.append(" Window Type | "); @@ -1634,12 +1634,9 @@ void Layer::miniDumpHeader(std::string& result) { result.append(" Transform | "); result.append(" Disp Frame (LTRB) | "); result.append(" Source Crop (LTRB) | "); - result.append(" Frame Rate (Explicit) [Focused]\n"); - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------------------"); - result.append("-------------------\n"); + result.append(" Frame Rate (Explicit) (Seamlessness) [Focused]\n"); + result.append(kDumpTableRowLength, '-'); + result.append("\n"); } std::string Layer::frameRateCompatibilityString(Layer::FrameRateCompatibility compatibility) { @@ -1690,21 +1687,18 @@ void Layer::miniDump(std::string& result, const DisplayDevice& display) const { crop.bottom); if (layerState.frameRate.rate.isValid() || layerState.frameRate.type != FrameRateCompatibility::Default) { - StringAppendF(&result, "%s %15s seamless=%s", to_string(layerState.frameRate.rate).c_str(), + StringAppendF(&result, "%s %15s %17s", to_string(layerState.frameRate.rate).c_str(), frameRateCompatibilityString(layerState.frameRate.type).c_str(), toString(layerState.frameRate.seamlessness).c_str()); } else { - StringAppendF(&result, " "); + result.append(41, ' '); } const auto focused = isLayerFocusedBasedOnPriority(getFrameRateSelectionPriority()); StringAppendF(&result, " [%s]\n", focused ? "*" : " "); - result.append("- - - - - - - - - - - - - - - - "); - result.append("- - - - - - - - - - - - - - - - "); - result.append("- - - - - - - - - - - - - - - - "); - result.append("- - - - - - - - - - - - - - - - "); - result.append("- - - - - - - -\n"); + result.append(kDumpTableRowLength, '-'); + result.append("\n"); } void Layer::dumpFrameStats(std::string& result) const { -- cgit v1.2.3-59-g8ed1b