Merge "Propagate user preferred mode to SurfaceControl, only if it has changed." into tm-dev (5a53a498) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2463,7 +2463,7 @@ public final class DisplayManagerService extends SystemService {
		pw.println(" mMinimumBrightnessCurve=" + mMinimumBrightnessCurve);

		if (mUserPreferredMode != null) {
		pw.println(mUserPreferredMode);
		pw.println(" mUserPreferredMode=" + mUserPreferredMode);
		}

		pw.println();

+12 −6

Original line number	Diff line number	Diff line
		@@ -884,20 +884,26 @@ final class LocalDisplayAdapter extends DisplayAdapter {
		public void setUserPreferredDisplayModeLocked(Display.Mode mode) {
		final int oldModeId = getPreferredModeId();
		mUserPreferredMode = mode;
		if (mode != null && (mode.isRefreshRateSet() ^ mode.isResolutionSet())) {
		mUserPreferredMode = findMode(mode.getPhysicalWidth(),
		if (mode != null && (mode.isRefreshRateSet() \|\| mode.isResolutionSet())) {
		Display.Mode matchingSupportedMode;
		matchingSupportedMode = findMode(mode.getPhysicalWidth(),
		mode.getPhysicalHeight(), mode.getRefreshRate());
		if (matchingSupportedMode != null) {
		mUserPreferredMode = matchingSupportedMode;
		}
		}
		mUserPreferredModeId = findUserPreferredModeIdLocked(mode);

		if (oldModeId != getPreferredModeId()) {
		updateDeviceInfoLocked();
		mUserPreferredModeId = findUserPreferredModeIdLocked(mUserPreferredMode);

		if (oldModeId == getPreferredModeId()) {
		return;
		}
		updateDeviceInfoLocked();

		if (!mSurfaceControlProxy.getBootDisplayModeSupport()) {
		return;
		}
		if (mUserPreferredMode == null) {
		if (mUserPreferredModeId == INVALID_MODE_ID) {
		mSurfaceControlProxy.clearBootDisplayMode(getDisplayTokenLocked());
		} else {
		int preferredSfDisplayModeId = findSfDisplayModeIdLocked(