diff options
25 files changed, 136 insertions, 93 deletions
diff --git a/core/java/com/android/internal/display/BrightnessSynchronizer.java b/core/java/com/android/internal/display/BrightnessSynchronizer.java index 9f5ed65fa252..21fbf9d03c71 100644 --- a/core/java/com/android/internal/display/BrightnessSynchronizer.java +++ b/core/java/com/android/internal/display/BrightnessSynchronizer.java @@ -134,7 +134,8 @@ public class BrightnessSynchronizer { * Prints data on dumpsys. */ public void dump(PrintWriter pw) { - pw.println("BrightnessSynchronizer"); + pw.println("BrightnessSynchronizer:"); + pw.println("-----------------------"); pw.println(" mLatestIntBrightness=" + mLatestIntBrightness); pw.println(" mLatestFloatBrightness=" + mLatestFloatBrightness); pw.println(" mCurrentUpdate=" + mCurrentUpdate); diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 240e91bccaca..907e7c639352 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -45,6 +45,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; import android.util.EventLog; +import android.util.IndentingPrintWriter; import android.util.MathUtils; import android.util.Slog; import android.util.SparseArray; @@ -562,6 +563,7 @@ public class AutomaticBrightnessController { public void resetShortTermModel() { mCurrentBrightnessMapper.clearUserDataPoints(); mShortTermModel.reset(); + Slog.i(TAG, "Resetting short term model"); } public boolean setBrightnessConfiguration(BrightnessConfiguration configuration, @@ -598,74 +600,79 @@ public class AutomaticBrightnessController { } public void dump(PrintWriter pw) { + IndentingPrintWriter ipw = new IndentingPrintWriter(pw); + ipw.increaseIndent(); pw.println(); pw.println("Automatic Brightness Controller Configuration:"); - pw.println(" mState=" + configStateToString(mState)); - pw.println(" mScreenBrightnessRangeMinimum=" + mScreenBrightnessRangeMinimum); - pw.println(" mScreenBrightnessRangeMaximum=" + mScreenBrightnessRangeMaximum); - pw.println(" mDozeScaleFactor=" + mDozeScaleFactor); - pw.println(" mInitialLightSensorRate=" + mInitialLightSensorRate); - pw.println(" mNormalLightSensorRate=" + mNormalLightSensorRate); - pw.println(" mLightSensorWarmUpTimeConfig=" + mLightSensorWarmUpTimeConfig); - pw.println(" mBrighteningLightDebounceConfig=" + mBrighteningLightDebounceConfig); - pw.println(" mDarkeningLightDebounceConfig=" + mDarkeningLightDebounceConfig); - pw.println(" mBrighteningLightDebounceConfigIdle=" + mBrighteningLightDebounceConfigIdle); - pw.println(" mDarkeningLightDebounceConfigIdle=" + mDarkeningLightDebounceConfigIdle); - pw.println(" mResetAmbientLuxAfterWarmUpConfig=" + mResetAmbientLuxAfterWarmUpConfig); - pw.println(" mAmbientLightHorizonLong=" + mAmbientLightHorizonLong); - pw.println(" mAmbientLightHorizonShort=" + mAmbientLightHorizonShort); - pw.println(" mWeightingIntercept=" + mWeightingIntercept); + pw.println("----------------------------------------------"); + ipw.println("mState=" + configStateToString(mState)); + ipw.println("mScreenBrightnessRangeMinimum=" + mScreenBrightnessRangeMinimum); + ipw.println("mScreenBrightnessRangeMaximum=" + mScreenBrightnessRangeMaximum); + ipw.println("mDozeScaleFactor=" + mDozeScaleFactor); + ipw.println("mInitialLightSensorRate=" + mInitialLightSensorRate); + ipw.println("mNormalLightSensorRate=" + mNormalLightSensorRate); + ipw.println("mLightSensorWarmUpTimeConfig=" + mLightSensorWarmUpTimeConfig); + ipw.println("mBrighteningLightDebounceConfig=" + mBrighteningLightDebounceConfig); + ipw.println("mDarkeningLightDebounceConfig=" + mDarkeningLightDebounceConfig); + ipw.println("mBrighteningLightDebounceConfigIdle=" + mBrighteningLightDebounceConfigIdle); + ipw.println("mDarkeningLightDebounceConfigIdle=" + mDarkeningLightDebounceConfigIdle); + ipw.println("mResetAmbientLuxAfterWarmUpConfig=" + mResetAmbientLuxAfterWarmUpConfig); + ipw.println("mAmbientLightHorizonLong=" + mAmbientLightHorizonLong); + ipw.println("mAmbientLightHorizonShort=" + mAmbientLightHorizonShort); + ipw.println("mWeightingIntercept=" + mWeightingIntercept); pw.println(); pw.println("Automatic Brightness Controller State:"); - pw.println(" mLightSensor=" + mLightSensor); - pw.println(" mLightSensorEnabled=" + mLightSensorEnabled); - pw.println(" mLightSensorEnableTime=" + TimeUtils.formatUptime(mLightSensorEnableTime)); - pw.println(" mCurrentLightSensorRate=" + mCurrentLightSensorRate); - pw.println(" mAmbientLux=" + mAmbientLux); - pw.println(" mAmbientLuxValid=" + mAmbientLuxValid); - pw.println(" mPreThresholdLux=" + mPreThresholdLux); - pw.println(" mPreThresholdBrightness=" + mPreThresholdBrightness); - pw.println(" mAmbientBrighteningThreshold=" + mAmbientBrighteningThreshold); - pw.println(" mAmbientDarkeningThreshold=" + mAmbientDarkeningThreshold); - pw.println(" mScreenBrighteningThreshold=" + mScreenBrighteningThreshold); - pw.println(" mScreenDarkeningThreshold=" + mScreenDarkeningThreshold); - pw.println(" mLastObservedLux=" + mLastObservedLux); - pw.println(" mLastObservedLuxTime=" + TimeUtils.formatUptime(mLastObservedLuxTime)); - pw.println(" mRecentLightSamples=" + mRecentLightSamples); - pw.println(" mAmbientLightRingBuffer=" + mAmbientLightRingBuffer); - pw.println(" mScreenAutoBrightness=" + mScreenAutoBrightness); - pw.println(" mDisplayPolicy=" + DisplayPowerRequest.policyToString(mDisplayPolicy)); - pw.println(" mShortTermModel="); - mShortTermModel.dump(pw); - pw.println(" mPausedShortTermModel="); - mPausedShortTermModel.dump(pw); - - pw.println(); - pw.println(" mBrightnessAdjustmentSamplePending=" + mBrightnessAdjustmentSamplePending); - pw.println(" mBrightnessAdjustmentSampleOldLux=" + mBrightnessAdjustmentSampleOldLux); - pw.println(" mBrightnessAdjustmentSampleOldBrightness=" + pw.println("--------------------------------------"); + ipw.println("mLightSensor=" + mLightSensor); + ipw.println("mLightSensorEnabled=" + mLightSensorEnabled); + ipw.println("mLightSensorEnableTime=" + TimeUtils.formatUptime(mLightSensorEnableTime)); + ipw.println("mCurrentLightSensorRate=" + mCurrentLightSensorRate); + ipw.println("mAmbientLux=" + mAmbientLux); + ipw.println("mAmbientLuxValid=" + mAmbientLuxValid); + ipw.println("mPreThresholdLux=" + mPreThresholdLux); + ipw.println("mPreThresholdBrightness=" + mPreThresholdBrightness); + ipw.println("mAmbientBrighteningThreshold=" + mAmbientBrighteningThreshold); + ipw.println("mAmbientDarkeningThreshold=" + mAmbientDarkeningThreshold); + ipw.println("mScreenBrighteningThreshold=" + mScreenBrighteningThreshold); + ipw.println("mScreenDarkeningThreshold=" + mScreenDarkeningThreshold); + ipw.println("mLastObservedLux=" + mLastObservedLux); + ipw.println("mLastObservedLuxTime=" + TimeUtils.formatUptime(mLastObservedLuxTime)); + ipw.println("mRecentLightSamples=" + mRecentLightSamples); + ipw.println("mAmbientLightRingBuffer=" + mAmbientLightRingBuffer); + ipw.println("mScreenAutoBrightness=" + mScreenAutoBrightness); + ipw.println("mDisplayPolicy=" + DisplayPowerRequest.policyToString(mDisplayPolicy)); + ipw.println("mShortTermModel="); + + mShortTermModel.dump(ipw); + ipw.println("mPausedShortTermModel="); + mPausedShortTermModel.dump(ipw); + + ipw.println(); + ipw.println("mBrightnessAdjustmentSamplePending=" + mBrightnessAdjustmentSamplePending); + ipw.println("mBrightnessAdjustmentSampleOldLux=" + mBrightnessAdjustmentSampleOldLux); + ipw.println("mBrightnessAdjustmentSampleOldBrightness=" + mBrightnessAdjustmentSampleOldBrightness); - pw.println(" mForegroundAppPackageName=" + mForegroundAppPackageName); - pw.println(" mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName); - pw.println(" mForegroundAppCategory=" + mForegroundAppCategory); - pw.println(" mPendingForegroundAppCategory=" + mPendingForegroundAppCategory); - pw.println(" Current mode=" + ipw.println("mForegroundAppPackageName=" + mForegroundAppPackageName); + ipw.println("mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName); + ipw.println("mForegroundAppCategory=" + mForegroundAppCategory); + ipw.println("mPendingForegroundAppCategory=" + mPendingForegroundAppCategory); + ipw.println("Current mode=" + autoBrightnessModeToString(mCurrentBrightnessMapper.getMode())); for (int i = 0; i < mBrightnessMappingStrategyMap.size(); i++) { - pw.println(); - pw.println(" Mapper for mode " + ipw.println(); + ipw.println("Mapper for mode " + autoBrightnessModeToString(mBrightnessMappingStrategyMap.keyAt(i)) + ":"); - mBrightnessMappingStrategyMap.valueAt(i).dump(pw, + mBrightnessMappingStrategyMap.valueAt(i).dump(ipw, mBrightnessRangeController.getNormalBrightnessMax()); } - pw.println(); - pw.println(" mAmbientBrightnessThresholds=" + mAmbientBrightnessThresholds); - pw.println(" mAmbientBrightnessThresholdsIdle=" + mAmbientBrightnessThresholdsIdle); - pw.println(" mScreenBrightnessThresholds=" + mScreenBrightnessThresholds); - pw.println(" mScreenBrightnessThresholdsIdle=" + mScreenBrightnessThresholdsIdle); + ipw.println(); + ipw.println("mAmbientBrightnessThresholds=" + mAmbientBrightnessThresholds); + ipw.println("mAmbientBrightnessThresholdsIdle=" + mAmbientBrightnessThresholdsIdle); + ipw.println("mScreenBrightnessThresholds=" + mScreenBrightnessThresholds); + ipw.println("mScreenBrightnessThresholdsIdle=" + mScreenBrightnessThresholdsIdle); } public float[] getLastSensorValues() { @@ -1339,8 +1346,10 @@ public class AutomaticBrightnessController { + "\n mIsValid: " + mIsValid; } - void dump(PrintWriter pw) { - pw.println(this); + void dump(IndentingPrintWriter ipw) { + ipw.increaseIndent(); + ipw.println(this); + ipw.decreaseIndent(); } } diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java index b0507fb78a41..6a019f3d024c 100644 --- a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -1073,7 +1073,9 @@ public abstract class BrightnessMappingStrategy { pw.println(" mBrightnessRangeAdjustmentApplied=" + mBrightnessRangeAdjustmentApplied); pw.println(" shortTermModelTimeout=" + getShortTermModelTimeout()); - pw.println(" Previous short-term models (oldest to newest): "); + if (!mPreviousBrightnessSplines.isEmpty()) { + pw.println(" Previous short-term models (oldest to newest): "); + } for (int i = 0; i < mPreviousBrightnessSplines.size(); i++) { pw.println(" Computed at " + FORMAT.format(new Date(mBrightnessSplineChangeTimes.get(i))) + ": "); diff --git a/services/core/java/com/android/server/display/BrightnessThrottler.java b/services/core/java/com/android/server/display/BrightnessThrottler.java index 631e7518b746..b56a23416693 100644 --- a/services/core/java/com/android/server/display/BrightnessThrottler.java +++ b/services/core/java/com/android/server/display/BrightnessThrottler.java @@ -265,6 +265,7 @@ class BrightnessThrottler { private void dumpLocal(PrintWriter pw) { pw.println("BrightnessThrottler:"); + pw.println("--------------------"); pw.println(" mThermalBrightnessThrottlingDataId=" + mThermalBrightnessThrottlingDataId); pw.println(" mThermalThrottlingData=" + mThermalThrottlingData); pw.println(" mUniqueDisplayId=" + mUniqueDisplayId); diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java index ac5dd203fff6..0f65360e9ee4 100644 --- a/services/core/java/com/android/server/display/BrightnessTracker.java +++ b/services/core/java/com/android/server/display/BrightnessTracker.java @@ -782,6 +782,7 @@ public class BrightnessTracker { public void dump(final PrintWriter pw) { pw.println("BrightnessTracker state:"); + pw.println("------------------------"); synchronized (mDataCollectionLock) { pw.println(" mStarted=" + mStarted); pw.println(" mLightSensor=" + mLightSensor); diff --git a/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java b/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java index 146810f5e1e6..4c133ff035a8 100644 --- a/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java +++ b/services/core/java/com/android/server/display/DeviceStateToLayoutMap.java @@ -95,6 +95,7 @@ class DeviceStateToLayoutMap { public void dumpLocked(IndentingPrintWriter ipw) { ipw.println("DeviceStateToLayoutMap:"); + ipw.println("-----------------------"); ipw.increaseIndent(); ipw.println("mIsPortInDisplayLayoutEnabled=" + mIsPortInDisplayLayoutEnabled); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 187caba4db03..99ad65d14ff2 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -3340,6 +3340,7 @@ public final class DisplayManagerService extends SystemService { pw.println(); final int displayStateCount = mDisplayStates.size(); pw.println("Display States: size=" + displayStateCount); + pw.println("---------------------"); for (int i = 0; i < displayStateCount; i++) { final int displayId = mDisplayStates.keyAt(i); final int displayState = mDisplayStates.valueAt(i); @@ -3355,6 +3356,7 @@ public final class DisplayManagerService extends SystemService { pw.println(); pw.println("Display Adapters: size=" + mDisplayAdapters.size()); + pw.println("------------------------"); for (DisplayAdapter adapter : mDisplayAdapters) { pw.println(" " + adapter.getName()); adapter.dumpLocked(ipw); @@ -3362,6 +3364,7 @@ public final class DisplayManagerService extends SystemService { pw.println(); pw.println("Display Devices: size=" + mDisplayDeviceRepo.sizeLocked()); + pw.println("-----------------------"); mDisplayDeviceRepo.forEachLocked(device -> { pw.println(" " + device.getDisplayDeviceInfoLocked()); device.dumpLocked(ipw); @@ -3373,6 +3376,7 @@ public final class DisplayManagerService extends SystemService { final int callbackCount = mCallbacks.size(); pw.println(); pw.println("Callbacks: size=" + callbackCount); + pw.println("-----------------"); for (int i = 0; i < callbackCount; i++) { CallbackRecord callback = mCallbacks.valueAt(i); pw.println(" " + i + ": mPid=" + callback.mPid @@ -3385,6 +3389,7 @@ public final class DisplayManagerService extends SystemService { for (int i = 0; i < displayPowerControllerCount; i++) { mDisplayPowerControllers.valueAt(i).dump(pw); } + pw.println(); mPersistentDataStore.dump(pw); @@ -3403,8 +3408,10 @@ public final class DisplayManagerService extends SystemService { } pw.println(); mDisplayModeDirector.dump(pw); + pw.println(); mBrightnessSynchronizer.dump(pw); if (mSmallAreaDetectionController != null) { + pw.println(); mSmallAreaDetectionController.dump(pw); } diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 047eb29efcc0..cb3de73373ae 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -253,10 +253,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // The display blanker. private final DisplayBlanker mBlanker; - // The LogicalDisplay tied to this DisplayPowerController2. + // The LogicalDisplay tied to this DisplayPowerController. private final LogicalDisplay mLogicalDisplay; - // The ID of the LogicalDisplay tied to this DisplayPowerController2. + // The ID of the LogicalDisplay tied to this DisplayPowerController. private final int mDisplayId; // The ID of the display which this display follows for brightness purposes. @@ -466,7 +466,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private ObjectAnimator mColorFadeOffAnimator; private DualRampAnimator<DisplayPowerState> mScreenBrightnessRampAnimator; - // True if this DisplayPowerController2 has been stopped and should no longer be running. + // True if this DisplayPowerController has been stopped and should no longer be running. private boolean mStopped; private DisplayDeviceConfig mDisplayDeviceConfig; @@ -861,7 +861,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mLeadDisplayId = leadDisplayId; final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked(); if (device == null) { - Slog.wtf(mTag, "Display Device is null in DisplayPowerController2 for display: " + Slog.wtf(mTag, "Display Device is null in DisplayPowerController for display: " + mLogicalDisplay.getDisplayIdLocked()); return; } @@ -935,7 +935,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call /** * Unregisters all listeners and interrupts all running threads; halting future work. * - * This method should be called when the DisplayPowerController2 is no longer in use; i.e. when + * This method should be called when the DisplayPowerController is no longer in use; i.e. when * the {@link #mDisplayId display} has been removed. */ @Override @@ -2628,6 +2628,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call synchronized (mLock) { pw.println(); pw.println("Display Power Controller:"); + pw.println("-------------------------"); + pw.println(" mDisplayId=" + mDisplayId); pw.println(" mLeadDisplayId=" + mLeadDisplayId); pw.println(" mLightSensor=" + mLightSensor); @@ -2702,25 +2704,39 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call + mColorFadeOffAnimator.isStarted()); } + pw.println(); if (mPowerState != null) { mPowerState.dump(pw); } + pw.println(); + if (mDisplayBrightnessController != null) { + mDisplayBrightnessController.dump(pw); + } + + pw.println(); + if (mBrightnessClamperController != null) { + mBrightnessClamperController.dump(ipw); + } + + pw.println(); + if (mBrightnessRangeController != null) { + mBrightnessRangeController.dump(pw); + } + + pw.println(); if (mAutomaticBrightnessController != null) { mAutomaticBrightnessController.dump(pw); dumpBrightnessEvents(pw); } - dumpRbcEvents(pw); + pw.println(); if (mScreenOffBrightnessSensorController != null) { mScreenOffBrightnessSensorController.dump(pw); } - if (mBrightnessRangeController != null) { - mBrightnessRangeController.dump(pw); - } - + pw.println(); if (mBrightnessThrottler != null) { mBrightnessThrottler.dump(pw); } @@ -2732,24 +2748,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } pw.println(); - if (mWakelockController != null) { mWakelockController.dumpLocal(pw); } pw.println(); - if (mDisplayBrightnessController != null) { - mDisplayBrightnessController.dump(pw); - } - - pw.println(); if (mDisplayStateController != null) { - mDisplayStateController.dumpsys(pw); - } - - pw.println(); - if (mBrightnessClamperController != null) { - mBrightnessClamperController.dump(ipw); + mDisplayStateController.dump(pw); } } diff --git a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java index 882c02faedf9..215932ca19be 100644 --- a/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java +++ b/services/core/java/com/android/server/display/DisplayPowerProximityStateController.java @@ -315,6 +315,7 @@ public final class DisplayPowerProximityStateController { public void dumpLocal(PrintWriter pw) { pw.println(); pw.println("DisplayPowerProximityStateController:"); + pw.println("-------------------------------------"); synchronized (mLock) { pw.println(" mPendingWaitForNegativeProximityLocked=" + mPendingWaitForNegativeProximityLocked); diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index e5efebcf1b41..2fbb114c9a63 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -344,7 +344,6 @@ final class DisplayPowerState { } public void dump(PrintWriter pw) { - pw.println(); pw.println("Display Power State:"); pw.println(" mStopped=" + mStopped); pw.println(" mScreenState=" + Display.stateToString(mScreenState)); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 6e0b9cf2f234..0570b2ab510b 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -1286,7 +1286,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { pw.println(" " + mSupportedModes.valueAt(i)); } pw.println("mSupportedColorModes=" + mSupportedColorModes); - pw.println("mDisplayDeviceConfig=" + mDisplayDeviceConfig); + pw.println(""); + pw.println("DisplayDeviceConfig: "); + pw.println("---------------------"); + pw.println(mDisplayDeviceConfig); } private int findSfDisplayModeIdLocked(int displayModeId, int modeGroup) { diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java index 5d55d1904f1b..e8be8a449652 100644 --- a/services/core/java/com/android/server/display/LogicalDisplay.java +++ b/services/core/java/com/android/server/display/LogicalDisplay.java @@ -1040,6 +1040,9 @@ final class LogicalDisplay { public void dumpLocked(PrintWriter pw) { pw.println("mDisplayId=" + mDisplayId); + pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null + ? mPrimaryDisplayDevice.getNameLocked() + "(" + mPrimaryDisplayDevice.getUniqueId() + + ")" : "null")); pw.println("mIsEnabled=" + mIsEnabled); pw.println("mIsInTransition=" + mIsInTransition); pw.println("mLayerStack=" + mLayerStack); @@ -1049,8 +1052,6 @@ final class LogicalDisplay { pw.println("mRequestedColorMode=" + mRequestedColorMode); pw.println("mDisplayOffset=(" + mDisplayOffsetX + ", " + mDisplayOffsetY + ")"); pw.println("mDisplayScalingDisabled=" + mDisplayScalingDisabled); - pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ? - mPrimaryDisplayDevice.getNameLocked() : "null")); pw.println("mBaseDisplayInfo=" + mBaseDisplayInfo); pw.println("mOverrideDisplayInfo=" + mOverrideDisplayInfo); pw.println("mRequestedMinimalPostProcessing=" + mRequestedMinimalPostProcessing); diff --git a/services/core/java/com/android/server/display/LogicalDisplayMapper.java b/services/core/java/com/android/server/display/LogicalDisplayMapper.java index e9ecfc67b7db..c1cafc23d328 100644 --- a/services/core/java/com/android/server/display/LogicalDisplayMapper.java +++ b/services/core/java/com/android/server/display/LogicalDisplayMapper.java @@ -427,6 +427,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { public void dumpLocked(PrintWriter pw) { pw.println("LogicalDisplayMapper:"); + pw.println("---------------------"); IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); ipw.increaseIndent(); diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java index 2d7792d01c53..9cdc91865bf8 100644 --- a/services/core/java/com/android/server/display/PersistentDataStore.java +++ b/services/core/java/com/android/server/display/PersistentDataStore.java @@ -628,7 +628,9 @@ final class PersistentDataStore { } public void dump(PrintWriter pw) { - pw.println("PersistentDataStore"); + pw.println("PersistentDataStore:"); + pw.println("--------------------"); + pw.println(" mLoaded=" + mLoaded); pw.println(" mDirty=" + mDirty); pw.println(" RememberedWifiDisplays:"); diff --git a/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java b/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java index 0a884c98402e..b63eba31c948 100644 --- a/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java +++ b/services/core/java/com/android/server/display/ScreenOffBrightnessSensorController.java @@ -121,6 +121,7 @@ public class ScreenOffBrightnessSensorController implements SensorEventListener /** Dump current state */ public void dump(PrintWriter pw) { pw.println("Screen Off Brightness Sensor Controller:"); + pw.println("----------------------------------------"); IndentingPrintWriter idpw = new IndentingPrintWriter(pw); idpw.increaseIndent(); idpw.println("registered=" + mRegistered); diff --git a/services/core/java/com/android/server/display/SmallAreaDetectionController.java b/services/core/java/com/android/server/display/SmallAreaDetectionController.java index bf384b02d95e..3ed7e5756b8f 100644 --- a/services/core/java/com/android/server/display/SmallAreaDetectionController.java +++ b/services/core/java/com/android/server/display/SmallAreaDetectionController.java @@ -133,7 +133,8 @@ final class SmallAreaDetectionController { } void dump(PrintWriter pw) { - pw.println("Small area detection allowlist"); + pw.println("Small area detection allowlist:"); + pw.println("-------------------------------"); pw.println(" Packages:"); synchronized (mLock) { for (String pkg : mAllowPkgMap.keySet()) { diff --git a/services/core/java/com/android/server/display/WakelockController.java b/services/core/java/com/android/server/display/WakelockController.java index 5b0229cbb393..35207236d1cf 100644 --- a/services/core/java/com/android/server/display/WakelockController.java +++ b/services/core/java/com/android/server/display/WakelockController.java @@ -417,6 +417,7 @@ public final class WakelockController { */ public void dumpLocal(PrintWriter pw) { pw.println("WakelockController State:"); + pw.println("-------------------------"); pw.println(" mDisplayId=" + mDisplayId); pw.println(" mUnfinishedBusiness=" + hasUnfinishedBusiness()); pw.println(" mOnStateChangePending=" + isOnStateChangedPending()); diff --git a/services/core/java/com/android/server/display/brightness/DisplayBrightnessStrategySelector.java b/services/core/java/com/android/server/display/brightness/DisplayBrightnessStrategySelector.java index 1b49bbc74f92..06890e72f068 100644 --- a/services/core/java/com/android/server/display/brightness/DisplayBrightnessStrategySelector.java +++ b/services/core/java/com/android/server/display/brightness/DisplayBrightnessStrategySelector.java @@ -262,6 +262,7 @@ public class DisplayBrightnessStrategySelector { public void dump(PrintWriter writer) { writer.println(); writer.println("DisplayBrightnessStrategySelector:"); + writer.println("----------------------------------"); writer.println(" mDisplayId= " + mDisplayId); writer.println(" mOldBrightnessStrategyName= " + mOldBrightnessStrategyName); writer.println( diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java index 8ee708562565..d00ab83b2ec6 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java @@ -214,6 +214,7 @@ public class BrightnessClamperController { */ public void dump(PrintWriter writer) { writer.println("BrightnessClamperController:"); + writer.println("----------------------------"); writer.println(" mBrightnessCap: " + mBrightnessCap); writer.println(" mClamperType: " + mClamperType); writer.println(" mClamperApplied: " + mClamperApplied); diff --git a/services/core/java/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategy.java b/services/core/java/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategy.java index 1db9bbe27ecc..91c985830b97 100644 --- a/services/core/java/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategy.java +++ b/services/core/java/com/android/server/display/brightness/strategy/AutoBrightnessFallbackStrategy.java @@ -100,6 +100,7 @@ public final class AutoBrightnessFallbackStrategy implements DisplayBrightnessSt writer.println("AutoBrightnessFallbackStrategy:"); writer.println(" mLeadDisplayId=" + mLeadDisplayId); writer.println(" mIsDisplayEnabled=" + mIsDisplayEnabled); + writer.println(""); if (mScreenOffBrightnessSensorController != null) { IndentingPrintWriter ipw = new IndentingPrintWriter(writer, " "); mScreenOffBrightnessSensorController.dump(ipw); diff --git a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java index 35be0f3bc942..69b67c87afb9 100644 --- a/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java +++ b/services/core/java/com/android/server/display/feature/DisplayManagerFlags.java @@ -420,6 +420,7 @@ public class DisplayManagerFlags { */ public void dump(PrintWriter pw) { pw.println("DisplayManagerFlags:"); + pw.println("--------------------"); pw.println(" " + mAdaptiveToneImprovements1); pw.println(" " + mAdaptiveToneImprovements2); pw.println(" " + mBackUpSmoothDisplayAndForcePeakRefreshRateFlagState); diff --git a/services/core/java/com/android/server/display/mode/DisplayModeDirector.java b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java index d909004e6381..18e0d6ee5ea3 100644 --- a/services/core/java/com/android/server/display/mode/DisplayModeDirector.java +++ b/services/core/java/com/android/server/display/mode/DisplayModeDirector.java @@ -578,7 +578,8 @@ public class DisplayModeDirector { * @param pw The stream to dump information to. */ public void dump(PrintWriter pw) { - pw.println("DisplayModeDirector"); + pw.println("DisplayModeDirector:"); + pw.println("--------------------"); synchronized (mLock) { pw.println(" mSupportedModesByDisplay:"); for (int i = 0; i < mSupportedModesByDisplay.size(); i++) { diff --git a/services/core/java/com/android/server/display/state/DisplayStateController.java b/services/core/java/com/android/server/display/state/DisplayStateController.java index 21bb208981c8..dba687413496 100644 --- a/services/core/java/com/android/server/display/state/DisplayStateController.java +++ b/services/core/java/com/android/server/display/state/DisplayStateController.java @@ -114,9 +114,9 @@ public class DisplayStateController { * * @param pw The PrintWriter used to dump the state. */ - public void dumpsys(PrintWriter pw) { - pw.println(); + public void dump(PrintWriter pw) { pw.println("DisplayStateController:"); + pw.println("-----------------------"); pw.println(" mPerformScreenOffTransition:" + mPerformScreenOffTransition); pw.println(" mDozeStateOverride=" + mDozeStateOverride); diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java index 7ea576d1ed3a..49c45a774dcf 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceController.java @@ -427,7 +427,8 @@ public class DisplayWhiteBalanceController implements * The writer used to dump the state. */ public void dump(PrintWriter writer) { - writer.println("DisplayWhiteBalanceController"); + writer.println("DisplayWhiteBalanceController:"); + writer.println("------------------------------"); writer.println(" mLoggingEnabled=" + mLoggingEnabled); writer.println(" mEnabled=" + mEnabled); writer.println(" mStrongModeEnabled=" + mStrongModeEnabled); diff --git a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceSettings.java b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceSettings.java index 0efb7494c5d0..a5755ac78a7f 100644 --- a/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceSettings.java +++ b/services/core/java/com/android/server/display/whitebalance/DisplayWhiteBalanceSettings.java @@ -23,7 +23,6 @@ import android.os.Looper; import android.os.Message; import android.util.Slog; -import com.android.internal.util.Preconditions; import com.android.server.LocalServices; import com.android.server.display.color.ColorDisplayService; import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal; @@ -129,7 +128,8 @@ public class DisplayWhiteBalanceSettings implements * The writer used to dump the state. */ public void dump(PrintWriter writer) { - writer.println("DisplayWhiteBalanceSettings"); + writer.println("DisplayWhiteBalanceSettings:"); + writer.println("----------------------------"); writer.println(" mLoggingEnabled=" + mLoggingEnabled); writer.println(" mContext=" + mContext); writer.println(" mHandler=" + mHandler); |