Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1edc6102b49132e8a67c00bcbc8dd84681ee6f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oleg Petšjonkin
2023-03-23 14:51:31 +00:00
committed by Automerger Merge Worker
parent 23a0e7c603 b179431214
commit da65d52913
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -2589,9 +2589,7 @@ public final class DisplayManagerService extends SystemService {
void setDisplayModeDirectorLoggingEnabled(boolean enabled) { void setDisplayModeDirectorLoggingEnabled(boolean enabled) {
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
if (mDisplayModeDirector != null) { mDisplayModeDirector.setLoggingEnabled(enabled);
mDisplayModeDirector.setLoggingEnabled(enabled);
}
} }
} }
@@ -2852,8 +2850,11 @@ public final class DisplayManagerService extends SystemService {
private void dumpInternal(PrintWriter pw) { private void dumpInternal(PrintWriter pw) {
pw.println("DISPLAY MANAGER (dumpsys display)"); pw.println("DISPLAY MANAGER (dumpsys display)");
BrightnessTracker brightnessTrackerLocal;
synchronized (mSyncRoot) { synchronized (mSyncRoot) {
brightnessTrackerLocal = mBrightnessTracker;
pw.println(" mSafeMode=" + mSafeMode); pw.println(" mSafeMode=" + mSafeMode);
pw.println(" mPendingTraversal=" + mPendingTraversal); pw.println(" mPendingTraversal=" + mPendingTraversal);
pw.println(" mViewports=" + mViewports); pw.println(" mViewports=" + mViewports);
@@ -2926,10 +2927,6 @@ public final class DisplayManagerService extends SystemService {
for (int i = 0; i < displayPowerControllerCount; i++) { for (int i = 0; i < displayPowerControllerCount; i++) {
mDisplayPowerControllers.valueAt(i).dump(pw); mDisplayPowerControllers.valueAt(i).dump(pw);
} }
if (mBrightnessTracker != null) {
pw.println();
mBrightnessTracker.dump(pw);
}
pw.println(); pw.println();
mPersistentDataStore.dump(pw); mPersistentDataStore.dump(pw);
@@ -2942,6 +2939,10 @@ public final class DisplayManagerService extends SystemService {
mDisplayWindowPolicyControllers.valueAt(i).second.dump(" ", pw); mDisplayWindowPolicyControllers.valueAt(i).second.dump(" ", pw);
} }
} }
if (brightnessTrackerLocal != null) {
pw.println();
brightnessTrackerLocal.dump(pw);
}
pw.println(); pw.println();
mDisplayModeDirector.dump(pw); mDisplayModeDirector.dump(pw);
mBrightnessSynchronizer.dump(pw); mBrightnessSynchronizer.dump(pw);