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

Commit 90d843f9 authored by Dennis Kiilerich's avatar Dennis Kiilerich
Browse files

Add information about display groups to display dumpsys 

* Added Display Group ID to each display
* Added dump of all display groups with display IDs

Bug: 342681202

Flag: EXEMPT log only update

Test: ran `adb shell dumpsys display`
Change-Id: I0f9f0f73c889b07a77b4ec7ca32ed6fa356e96cc
parent 9aaa4bc3

services/core/java/com/android/server/display/DisplayGroup.java

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.display;



import android.util.IndentingPrintWriter;



import java.util.ArrayList;

import java.util.List;
@@ -97,4 +99,14 @@ public class DisplayGroup { 
        }

        return displayIds;

    }



    /** Dumps information about the DisplayGroup. */

    void dumpLocked(IndentingPrintWriter ipw) {

        final int numDisplays = mDisplays.size();

        for (int i = 0; i < numDisplays; i++) {

            LogicalDisplay logicalDisplay = mDisplays.get(i);

            ipw.println("Display " + logicalDisplay.getDisplayIdLocked() + " "

                    + logicalDisplay.getPrimaryDisplayDeviceLocked());

        }

    }

}

services/core/java/com/android/server/display/LogicalDisplay.java

+1 −0
Original line number Diff line number Diff line
@@ -1146,6 +1146,7 @@ final class LogicalDisplay { 
        pw.println("mRequestedMinimalPostProcessing=" + mRequestedMinimalPostProcessing);

        pw.println("mFrameRateOverrides=" + Arrays.toString(mFrameRateOverrides));

        pw.println("mPendingFrameRateOverrideUids=" + mPendingFrameRateOverrideUids);

        pw.println("mDisplayGroupId=" + mDisplayGroupId);

        pw.println("mDisplayGroupName=" + mDisplayGroupName);

        pw.println("mThermalBrightnessThrottlingDataId=" + mThermalBrightnessThrottlingDataId);

        pw.println("mLeadDisplayId=" + mLeadDisplayId);

services/core/java/com/android/server/display/LogicalDisplayMapper.java

+15 −0
Original line number Diff line number Diff line
@@ -476,6 +476,21 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
            ipw.decreaseIndent();

            ipw.println();

        }



        final int displayGroupCount = mDisplayGroups.size();

        ipw.println();

        ipw.println("Display Groups: size=" + displayGroupCount);

        for (int i = 0; i < displayGroupCount; i++) {

            int groupId = mDisplayGroups.keyAt(i);

            DisplayGroup displayGroup = mDisplayGroups.valueAt(i);

            ipw.println("Group " + groupId + ":");

            ipw.increaseIndent();

            displayGroup.dumpLocked(ipw);

            ipw.decreaseIndent();

            ipw.println();

        }





        mDeviceStateToLayoutMap.dumpLocked(ipw);

    }