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

Commit ddd1be66 authored by Tim Murray's avatar Tim Murray
Browse files

display: fix trace spam 

requestDisplayStateInternal was creating too many async
tracks. Convert to asyncTraceForTrack to make traces comprehensible.

Test: traces appear
Bug: 250614152
Change-Id: Icc921f0a12a1a89a10280477c10374f19c8af4ef
parent a77b86f6

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

+12 −7
Original line number Diff line number Diff line
@@ -775,18 +775,24 @@ public final class DisplayManagerService extends SystemService { 
                return; // Display no longer exists or no change.

            }



            traceMessage = "requestDisplayStateInternal("

                    + displayId + ", "

                    + Display.stateToString(state)

            if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) {

                traceMessage = Display.stateToString(state)

                           + ", brightness=" + brightnessState

                    + ", sdrBrightness=" + sdrBrightnessState + ")";

            Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, traceMessage, displayId);

                           + ", sdrBrightness=" + sdrBrightnessState;

                Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_POWER,

                        "requestDisplayStateInternal:" + displayId,

                        traceMessage, displayId);

            }



            mDisplayStates.setValueAt(index, state);

            brightnessPair.brightness = brightnessState;

            brightnessPair.sdrBrightness = sdrBrightnessState;

            runnable = updateDisplayStateLocked(mLogicalDisplayMapper.getDisplayLocked(displayId)

                    .getPrimaryDisplayDeviceLocked());

            if (Trace.isTagEnabled(Trace.TRACE_TAG_POWER)) {

                Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_POWER,

                        "requestDisplayStateInternal:" + displayId, displayId);

            }

        }



        // Setting the display power state can take hundreds of milliseconds
@@ -796,7 +802,6 @@ public final class DisplayManagerService extends SystemService { 
        if (runnable != null) {

            runnable.run();

        }

        Trace.asyncTraceEnd(Trace.TRACE_TAG_POWER, traceMessage, displayId);

    }



    private class SettingsObserver extends ContentObserver {