Merge "DisplayModeDirector: remove debug_render_frame_rate_is_physical_refresh_rate" (6fe8cc66) · Commits · e / os / android_frameworks_base

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

+26 −25

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ import android.os.UserHandle;
		import android.provider.DeviceConfig;
		import android.provider.DeviceConfigInterface;
		import android.provider.Settings;
		import android.sysprop.DisplayProperties;
		import android.sysprop.SurfaceFlingerProperties;
		import android.text.TextUtils;
		import android.util.IndentingPrintWriter;
		import android.util.Pair;
		@@ -138,8 +138,7 @@ public class DisplayModeDirector {

		private boolean mAlwaysRespectAppRequest;

		// TODO(b/241447632): remove the flag once SF changes are ready
		private final boolean mRenderFrameRateIsPhysicalRefreshRate;
		private final boolean mSupportsFrameRateOverride;

		/**
		* The allowed refresh rate switching type. This is used by SurfaceFlinger.
		@@ -176,7 +175,7 @@ public class DisplayModeDirector {
		mHbmObserver = new HbmObserver(injector, ballotBox, BackgroundThread.getHandler(),
		mDeviceConfigDisplaySettings);
		mAlwaysRespectAppRequest = false;
		mRenderFrameRateIsPhysicalRefreshRate = injector.renderFrameRateIsPhysicalRefreshRate();
		mSupportsFrameRateOverride = injector.supportsFrameRateOverride();
		}

		/**
		@@ -238,21 +237,6 @@ public class DisplayModeDirector {
		}
		}

		if (mRenderFrameRateIsPhysicalRefreshRate) {
		for (int i = 0; i < votes.size(); i++) {

		Vote vote = votes.valueAt(i);
		vote.refreshRateRanges.physical.min = Math.max(vote.refreshRateRanges.physical.min,
		vote.refreshRateRanges.render.min);
		vote.refreshRateRanges.physical.max = Math.min(vote.refreshRateRanges.physical.max,
		vote.refreshRateRanges.render.max);
		vote.refreshRateRanges.render.min = Math.max(vote.refreshRateRanges.physical.min,
		vote.refreshRateRanges.render.min);
		vote.refreshRateRanges.render.max = Math.min(vote.refreshRateRanges.physical.max,
		vote.refreshRateRanges.render.max);
		}
		}

		return votes;
		}

		@@ -541,8 +525,7 @@ public class DisplayModeDirector {
		}
		}

		if (mModeSwitchingType == DisplayManager.SWITCHING_TYPE_NONE
		\|\| mRenderFrameRateIsPhysicalRefreshRate) {
		if (mModeSwitchingType == DisplayManager.SWITCHING_TYPE_NONE) {
		primarySummary.minRenderFrameRate = primarySummary.minPhysicalRefreshRate;
		primarySummary.maxRenderFrameRate = primarySummary.maxPhysicalRefreshRate;
		appRequestSummary.minRenderFrameRate = appRequestSummary.minPhysicalRefreshRate;
		@@ -612,6 +595,22 @@ public class DisplayModeDirector {
		continue;
		}

		// The physical refresh rate must be in the render frame rate range, unless
		// frame rate override is supported.
		if (!mSupportsFrameRateOverride) {
		if (physicalRefreshRate < (summary.minRenderFrameRate - FLOAT_TOLERANCE)
		\|\| physicalRefreshRate > (summary.maxRenderFrameRate + FLOAT_TOLERANCE)) {
		if (mLoggingEnabled) {
		Slog.w(TAG, "Discarding mode " + mode.getModeId()
		+ ", outside render rate bounds"
		+ ": minPhysicalRefreshRate=" + summary.minPhysicalRefreshRate
		+ ", maxPhysicalRefreshRate=" + summary.maxPhysicalRefreshRate
		+ ", modeRefreshRate=" + physicalRefreshRate);
		}
		continue;
		}
		}

		// Check whether the render frame rate range is achievable by the mode's physical
		// refresh rate, meaning that if a divisor of the physical refresh rate is in range
		// of the render frame rate.
		@@ -2979,7 +2978,7 @@ public class DisplayModeDirector {

		IThermalService getThermalService();

		boolean renderFrameRateIsPhysicalRefreshRate();
		boolean supportsFrameRateOverride();
		}

		@VisibleForTesting
		@@ -3034,9 +3033,11 @@ public class DisplayModeDirector {
		}

		@Override
		public boolean renderFrameRateIsPhysicalRefreshRate() {
		return DisplayProperties
		.debug_render_frame_rate_is_physical_refresh_rate().orElse(true);
		public boolean supportsFrameRateOverride() {
		return SurfaceFlingerProperties.enable_frame_rate_override().orElse(false)
		&& !SurfaceFlingerProperties.frame_rate_override_for_native_rates()
		.orElse(true)
		&& SurfaceFlingerProperties.frame_rate_override_global().orElse(false);
		}

		private DisplayManager getDisplayManager() {

services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

+111 −329

File changed.

Preview size limit exceeded, changes collapsed.