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

Commit 3d6d5f01 authored by Oleg Petsjonkin's avatar Oleg Petsjonkin
Browse files

Moving BrightnessTracker dump outside of syncRoot lock 

Bug: b/261799432
Test: adb shell dumpsys display
Change-Id: I6eaece7f5a56fdce1c06487b9caee024ac3421ee
parent c503984e

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

+8 −7
Original line number Diff line number Diff line
@@ -2589,11 +2589,9 @@ public final class DisplayManagerService extends SystemService { 


    void setDisplayModeDirectorLoggingEnabled(boolean enabled) {

        synchronized (mSyncRoot) {

            if (mDisplayModeDirector != null) {

            mDisplayModeDirector.setLoggingEnabled(enabled);

        }

    }

    }



    Display.Mode getActiveDisplayModeAtStart(int displayId) {

        synchronized (mSyncRoot) {
@@ -2852,8 +2850,11 @@ public final class DisplayManagerService extends SystemService { 


    private void dumpInternal(PrintWriter pw) {

        pw.println("DISPLAY MANAGER (dumpsys display)");

        BrightnessTracker brightnessTrackerLocal;



        synchronized (mSyncRoot) {

            brightnessTrackerLocal = mBrightnessTracker;



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

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

            pw.println("  mViewports=" + mViewports);
@@ -2926,10 +2927,6 @@ public final class DisplayManagerService extends SystemService { 
            for (int i = 0; i < displayPowerControllerCount; i++) {

                mDisplayPowerControllers.valueAt(i).dump(pw);

            }

            if (mBrightnessTracker != null) {

                pw.println();

                mBrightnessTracker.dump(pw);

            }

            pw.println();

            mPersistentDataStore.dump(pw);
@@ -2942,6 +2939,10 @@ public final class DisplayManagerService extends SystemService { 
                mDisplayWindowPolicyControllers.valueAt(i).second.dump("  ", pw);

            }

        }

        if (brightnessTrackerLocal != null) {

            pw.println();

            brightnessTrackerLocal.dump(pw);

        }

        pw.println();

        mDisplayModeDirector.dump(pw);

        mBrightnessSynchronizer.dump(pw);