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

Commit 0706bd24 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Dump DisplayModeDirector state without locking mSyncRoot" into sc-v2-dev am: 0566e1ec 

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

Change-Id: Ie59dfb3aecc2f7be833927ed0fde16d83d632f15
parents e7ccfccd 0566e1ec

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

+2 −3
Original line number Diff line number Diff line
@@ -2062,9 +2062,6 @@ public final class DisplayManagerService extends SystemService { 
            pw.println();

            mLogicalDisplayMapper.dumpLocked(pw);



            pw.println();

            mDisplayModeDirector.dump(pw);



            final int callbackCount = mCallbacks.size();

            pw.println();

            pw.println("Callbacks: size=" + callbackCount);
@@ -2087,6 +2084,8 @@ public final class DisplayManagerService extends SystemService { 
            pw.println();

            mPersistentDataStore.dump(pw);

        }

        pw.println();

        mDisplayModeDirector.dump(pw);

    }



    private static float[] getFloatArray(TypedArray array) {