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

Commit 0791a627 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add information about display groups to display dumpsys" into main

parents 0b1acca4 90d843f9

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
@@ -1160,6 +1160,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
@@ -478,6 +478,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);

    }