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

Commit 7465688a authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Automerger Merge Worker
Browse files

Merge "Moving BrightnessTracker dump outside of syncRoot lock" into udc-dev am: b1794312 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22200443



Change-Id: I0bc63dc2595581f913e54f3064e9e20342a4cdc6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9673127 b1794312

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);