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

Commit 00d0783d authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Dump DisplayManagerFlags 

- Add displaymanagerflags to dumpsys
- Add tostring (formatted with equal length) to displaymanager flagstate

Bug: 309080862
Test: dumpsys display | grep DisplayManagerFlags -A20

Change-Id: I02322980f534de2ec4b54fbd090c9605ac07312b
parent a891bc20

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

+4 −0
Original line number Diff line number Diff line
@@ -3189,6 +3189,10 @@ public final class DisplayManagerService extends SystemService { 
        if (mSmallAreaDetectionController != null) {

            mSmallAreaDetectionController.dump(pw);

        }



        pw.println();

        mFlags.dump(pw);



    }



    private static float[] getFloatArray(TypedArray array) {

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+32 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ package com.android.server.display.feature; 


import android.os.Build;

import android.os.SystemProperties;

import android.text.TextUtils;

import android.util.Slog;



import com.android.server.display.feature.flags.Flags;



import java.io.PrintWriter;

import java.util.function.Supplier;



/**
@@ -155,6 +157,25 @@ public class DisplayManagerFlags { 
        return mSmallAreaDetectionFlagState.isEnabled();

    }



    /**

     * dumps all flagstates

     * @param pw printWriter

     */

    public void dump(PrintWriter pw) {

        pw.println("DisplayManagerFlags:");

        pw.println(" " + mAdaptiveToneImprovements1);

        pw.println(" " + mAdaptiveToneImprovements2);

        pw.println(" " + mBackUpSmoothDisplayAndForcePeakRefreshRateFlagState);

        pw.println(" " + mConnectedDisplayErrorHandlingFlagState);

        pw.println(" " + mConnectedDisplayManagementFlagState);

        pw.println(" " + mDisplayOffloadFlagState);

        pw.println(" " + mExternalDisplayLimitModeState);

        pw.println(" " + mHdrClamperFlagState);

        pw.println(" " + mNbmControllerFlagState);

        pw.println(" " + mPowerThrottlingClamperFlagState);

        pw.println(" " + mSmallAreaDetectionFlagState);

    }



    private static class FlagState {



        private final String mName;
@@ -192,5 +213,16 @@ public class DisplayManagerFlags { 
            }

            return flagValue;

        }



        @Override

        public String toString() {

            // remove com.android.server.display.feature.flags. from the beginning of the name.

            // align all isEnabled() values.

            // Adjust lengths if we end up with longer names

            final int nameLength = mName.length();

            return TextUtils.substring(mName,  41, nameLength) + ": "

                    + TextUtils.formatSimple("%" + (93 - nameLength) + "s%s", " " , isEnabled())

                    + " (def:" + mFlagFunction.get() + ")";

        }

    }

}