Merge "Moving DisplayPowerController.dump outside syncRoot lock" into main (1c8dfd1f) · Commits · e / os / android_frameworks_base

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

+14 −7

Original line number	Diff line number	Diff line
		@@ -3377,10 +3377,18 @@ public final class DisplayManagerService extends SystemService {
		private void dumpInternal(PrintWriter pw) {
		pw.println("DISPLAY MANAGER (dumpsys display)");
		BrightnessTracker brightnessTrackerLocal;
		SparseArray<DisplayPowerController> displayPowerControllersLocal = new SparseArray<>();
		int displayPowerControllerCount;

		synchronized (mSyncRoot) {
		brightnessTrackerLocal = mBrightnessTracker;

		displayPowerControllerCount = mDisplayPowerControllers.size();
		for (int i = 0; i < displayPowerControllerCount; i++) {
		displayPowerControllersLocal.put(
		mDisplayPowerControllers.keyAt(i), mDisplayPowerControllers.valueAt(i));
		}

		pw.println(" mSafeMode=" + mSafeMode);
		pw.println(" mPendingTraversal=" + mPendingTraversal);
		pw.println(" mViewports=" + mViewports);
		@@ -3451,13 +3459,6 @@ public final class DisplayManagerService extends SystemService {
		+ ", mWifiDisplayScanRequested=" + callback.mWifiDisplayScanRequested);
		}

		final int displayPowerControllerCount = mDisplayPowerControllers.size();
		pw.println();
		pw.println("Display Power Controllers: size=" + displayPowerControllerCount);
		for (int i = 0; i < displayPowerControllerCount; i++) {
		mDisplayPowerControllers.valueAt(i).dump(pw);
		}

		pw.println();
		mPersistentDataStore.dump(pw);

		@@ -3470,6 +3471,12 @@ public final class DisplayManagerService extends SystemService {
		mDisplayWindowPolicyControllers.valueAt(i).second.dump(" ", pw);
		}
		}
		pw.println();
		pw.println("Display Power Controllers: size=" + displayPowerControllerCount);
		for (int i = 0; i < displayPowerControllerCount; i++) {
		displayPowerControllersLocal.valueAt(i).dump(pw);
		}

		if (brightnessTrackerLocal != null) {
		pw.println();
		brightnessTrackerLocal.dump(pw);