Merge "Log the saved historical HBM events." into sc-dev (ba942160) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,7 @@ public class DisplayDeviceConfig {
		+ ", transition: " + transitionPoint
		+ ", timeWindow: " + timeWindowMillis + "ms"
		+ ", timeMax: " + timeMaxMillis + "ms"
		+ ", timeMin: " + timeMinMillis
		+ ", timeMin: " + timeMinMillis + "ms"
		+ "} ";
		}
		}

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.IBinder;
		import android.os.PowerManager;
		import android.os.SystemClock;
		import android.util.Slog;
		import android.util.TimeUtils;
		import android.view.SurfaceControlHdrLayerInfoListener;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -189,6 +190,10 @@ class HighBrightnessModeController {
		}

		void dump(PrintWriter pw) {
		mHandler.runWithScissors(() -> dumpLocal(pw), 1000);
		}

		private void dumpLocal(PrintWriter pw) {
		pw.println("HighBrightnessModeController:");
		pw.println(" mCurrentMin=" + getCurrentBrightnessMin());
		pw.println(" mCurrentMax=" + getCurrentBrightnessMax());
		@@ -202,6 +207,29 @@ class HighBrightnessModeController {
		pw.println(" mIsHdrLayerPresent=" + mIsHdrLayerPresent);
		pw.println(" mBrightnessMin=" + mBrightnessMin);
		pw.println(" mBrightnessMax=" + mBrightnessMax);
		pw.println(" mRunningStartTimeMillis=" + TimeUtils.formatUptime(mRunningStartTimeMillis));
		pw.println(" mEvents=");
		final long currentTime = mClock.uptimeMillis();
		long lastStartTime = currentTime;
		if (mRunningStartTimeMillis != -1) {
		lastStartTime = dumpHbmEvent(pw, new HbmEvent(mRunningStartTimeMillis, currentTime));
		}
		for (HbmEvent event : mEvents) {
		if (lastStartTime > event.endTimeMillis) {
		pw.println(" event: [normal brightness]: "
		+ TimeUtils.formatDuration(lastStartTime - event.endTimeMillis));
		}
		lastStartTime = dumpHbmEvent(pw, event);
		}
		}

		private long dumpHbmEvent(PrintWriter pw, HbmEvent event) {
		final long duration = event.endTimeMillis - event.startTimeMillis;
		pw.println(" event: ["
		+ TimeUtils.formatUptime(event.startTimeMillis) + ", "
		+ TimeUtils.formatUptime(event.endTimeMillis) + "] ("
		+ TimeUtils.formatDuration(duration) + ")");
		return event.startTimeMillis;
		}

		private boolean isCurrentlyAllowed() {