Added to enable/disable log for DisplayModeDirector am: f6247e3d30 (9471fe8d) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1484,6 +1484,14 @@ public final class DisplayManagerService extends SystemService {
		}
		}

		void setDisplayModeDirectorLoggingEnabled(boolean enabled) {
		synchronized (mSyncRoot) {
		if (mDisplayModeDirector != null) {
		mDisplayModeDirector.setLoggingEnabled(enabled);
		}
		}
		}

		void setAmbientColorTemperatureOverride(float cct) {
		if (mDisplayPowerController != null) {
		synchronized (mSyncRoot) {

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,10 @@ class DisplayManagerShellCommand extends ShellCommand {
		return setDisplayWhiteBalanceLoggingEnabled(true);
		case "dwb-logging-disable":
		return setDisplayWhiteBalanceLoggingEnabled(false);
		case "dmd-logging-enable":
		return setDisplayModeDirectorLoggingEnabled(true);
		case "dmd-logging-disable":
		return setDisplayModeDirectorLoggingEnabled(false);
		case "dwb-set-cct":
		return setAmbientColorTemperatureOverride();
		default:
		@@ -80,6 +84,10 @@ class DisplayManagerShellCommand extends ShellCommand {
		pw.println(" Enable display white-balance logging.");
		pw.println(" dwb-logging-disable");
		pw.println(" Disable display white-balance logging.");
		pw.println(" dmd-logging-enable");
		pw.println(" Enable display mode director logging.");
		pw.println(" dmd-logging-disable");
		pw.println(" Disable display mode director logging.");
		pw.println(" dwb-set-cct CCT");
		pw.println(" Sets the ambient color temperature override to CCT (use -1 to disable).");
		pw.println();
		@@ -132,6 +140,11 @@ class DisplayManagerShellCommand extends ShellCommand {
		return 0;
		}

		private int setDisplayModeDirectorLoggingEnabled(boolean enabled) {
		mService.setDisplayModeDirectorLoggingEnabled(enabled);
		return 0;
		}

		private int setAmbientColorTemperatureOverride() {
		String cctText = getNextArg();
		if (cctText == null) {

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

+56 −10

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ import java.util.Objects;
		*/
		public class DisplayModeDirector {
		private static final String TAG = "DisplayModeDirector";
		private static final boolean DEBUG = false;
		private boolean mLoggingEnabled;

		private static final int MSG_REFRESH_RATE_RANGE_CHANGED = 1;
		private static final int MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED = 2;
		@@ -146,6 +146,14 @@ public class DisplayModeDirector {

		}

		public void setLoggingEnabled(boolean loggingEnabled) {
		if (mLoggingEnabled == loggingEnabled) {
		return;
		}
		mLoggingEnabled = loggingEnabled;
		mBrightnessObserver.setLoggingEnabled(loggingEnabled);
		}

		@NonNull
		private SparseArray<Vote> getVotesLocked(int displayId) {
		SparseArray<Vote> displayVotes = mVotesByDisplay.get(displayId);
		@@ -247,7 +255,7 @@ public class DisplayModeDirector {

		availableModes = filterModes(modes, primarySummary);
		if (availableModes.length > 0) {
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.w(TAG, "Found available modes=" + Arrays.toString(availableModes)
		+ " with lowest priority considered "
		+ Vote.priorityToString(lowestConsideredPriority)
		@@ -260,7 +268,7 @@ public class DisplayModeDirector {
		break;
		}

		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.w(TAG, "Couldn't find available modes with lowest priority set to "
		+ Vote.priorityToString(lowestConsideredPriority)
		+ " and with the following constraints: "
		@@ -282,7 +290,7 @@ public class DisplayModeDirector {
		Math.min(appRequestSummary.minRefreshRate, primarySummary.minRefreshRate);
		appRequestSummary.maxRefreshRate =
		Math.max(appRequestSummary.maxRefreshRate, primarySummary.maxRefreshRate);
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.i(TAG,
		String.format("App request range: [%.0f %.0f]",
		appRequestSummary.minRefreshRate,
		@@ -309,7 +317,7 @@ public class DisplayModeDirector {
		for (Display.Mode mode : supportedModes) {
		if (mode.getPhysicalWidth() != summary.width
		\|\| mode.getPhysicalHeight() != summary.height) {
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.w(TAG, "Discarding mode " + mode.getModeId() + ", wrong size"
		+ ": desiredWidth=" + summary.width
		+ ": desiredHeight=" + summary.height
		@@ -324,7 +332,7 @@ public class DisplayModeDirector {
		// comparison.
		if (refreshRate < (summary.minRefreshRate - FLOAT_TOLERANCE)
		\|\| refreshRate > (summary.maxRefreshRate + FLOAT_TOLERANCE)) {
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.w(TAG, "Discarding mode " + mode.getModeId()
		+ ", outside refresh rate bounds"
		+ ": minRefreshRate=" + summary.minRefreshRate
		@@ -424,7 +432,7 @@ public class DisplayModeDirector {
		}

		private void updateVoteLocked(int displayId, int priority, Vote vote) {
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.i(TAG, "updateVoteLocked(displayId=" + displayId
		+ ", priority=" + Vote.priorityToString(priority)
		+ ", vote=" + vote + ")");
		@@ -445,7 +453,7 @@ public class DisplayModeDirector {
		}

		if (votes.size() == 0) {
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.i(TAG, "No votes left for display " + displayId + ", removing.");
		}
		mVotesByDisplay.remove(displayId);
		@@ -1147,6 +1155,7 @@ public class DisplayModeDirector {
		private boolean mShouldObserveAmbientLowChange;
		private boolean mShouldObserveDisplayHighChange;
		private boolean mShouldObserveAmbientHighChange;
		private boolean mLoggingEnabled;

		private SensorManager mSensorManager;
		private Sensor mLightSensor;
		@@ -1275,6 +1284,14 @@ public class DisplayModeDirector {
		mDeviceConfigDisplaySettings.startListening();
		}

		public void setLoggingEnabled(boolean loggingEnabled) {
		if (mLoggingEnabled == loggingEnabled) {
		return;
		}
		mLoggingEnabled = loggingEnabled;
		mLightSensorListener.setLoggingEnabled(loggingEnabled);
		}

		public void onRefreshRateSettingChangedLocked(float min, float max) {
		boolean changeable = (max - min > 1f && max > 60f);
		if (mRefreshRateChangeable != changeable) {
		@@ -1551,7 +1568,7 @@ public class DisplayModeDirector {
		vote = Vote.forRefreshRates(mRefreshRateInHighZone, mRefreshRateInHighZone);
		}

		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.d(TAG, "Display brightness " + mBrightness + ", ambient lux " + mAmbientLux
		+ ", Vote " + vote);
		}
		@@ -1580,6 +1597,11 @@ public class DisplayModeDirector {

		@VisibleForTesting
		public void setDefaultDisplayState(int state) {
		if (mLoggingEnabled) {
		Slog.d(TAG, "setDefaultDisplayState: mDefaultDisplayState = "
		+ mDefaultDisplayState + ", state = " + state);
		}

		if (mDefaultDisplayState != state) {
		mDefaultDisplayState = state;
		updateSensorStatus();
		@@ -1591,13 +1613,28 @@ public class DisplayModeDirector {
		return;
		}

		if (mLoggingEnabled) {
		Slog.d(TAG, "updateSensorStatus: mShouldObserveAmbientLowChange = "
		+ mShouldObserveAmbientLowChange + ", mShouldObserveAmbientHighChange = "
		+ mShouldObserveAmbientHighChange);
		Slog.d(TAG, "updateSensorStatus: mLowPowerModeEnabled = "
		+ mLowPowerModeEnabled + ", mRefreshRateChangeable = "
		+ mRefreshRateChangeable);
		}

		if ((mShouldObserveAmbientLowChange \|\| mShouldObserveAmbientHighChange)
		&& isDeviceActive() && !mLowPowerModeEnabled && mRefreshRateChangeable) {
		mSensorManager.registerListener(mLightSensorListener,
		mLightSensor, LIGHT_SENSOR_RATE_MS * 1000, mHandler);
		if (mLoggingEnabled) {
		Slog.d(TAG, "updateSensorStatus: registerListener");
		}
		} else {
		mLightSensorListener.removeCallbacks();
		mSensorManager.unregisterListener(mLightSensorListener);
		if (mLoggingEnabled) {
		Slog.d(TAG, "updateSensorStatus: unregisterListener");
		}
		}
		}

		@@ -1611,16 +1648,25 @@ public class DisplayModeDirector {
		final private static int INJECT_EVENTS_INTERVAL_MS = LIGHT_SENSOR_RATE_MS;
		private float mLastSensorData;
		private long mTimestamp;
		private boolean mLoggingEnabled;

		public void dumpLocked(PrintWriter pw) {
		pw.println(" mLastSensorData: " + mLastSensorData);
		pw.println(" mTimestamp: " + formatTimestamp(mTimestamp));
		}


		public void setLoggingEnabled(boolean loggingEnabled) {
		if (mLoggingEnabled == loggingEnabled) {
		return;
		}
		mLoggingEnabled = loggingEnabled;
		}

		@Override
		public void onSensorChanged(SensorEvent event) {
		mLastSensorData = event.values[0];
		if (DEBUG) {
		if (mLoggingEnabled) {
		Slog.d(TAG, "On sensor changed: " + mLastSensorData);
		}