Merge "DMD: Also consider no votes when calculating specs" into sc-dev (037ab3a9) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -263,6 +263,8 @@ public class DisplayModeDirector {
		highestConsideredPriority = Vote.PRIORITY_APP_REQUEST_SIZE;
		}

		// We try to find a range of priorities which define a non-empty set of allowed display
		// modes. Each time we fail we increase the lowest priority.
		while (lowestConsideredPriority <= highestConsideredPriority) {
		summarizeVotes(
		votes, lowestConsideredPriority, highestConsideredPriority, primarySummary);
		@@ -343,8 +345,15 @@ public class DisplayModeDirector {
		}

		if (baseModeId == INVALID_DISPLAY_MODE_ID) {
		throw new IllegalStateException("Can't select a base display mode for display "
		+ displayId + ". The votes are " + mVotesByDisplay.valueAt(displayId));
		Slog.w(TAG, "Can't find a set of allowed modes which satisfies the votes. Falling"
		+ " back to the default mode. Display = " + displayId + ", votes = " + votes
		+ ", supported modes = " + Arrays.toString(modes));

		float fps = defaultMode.getRefreshRate();
		return new DesiredDisplayModeSpecs(defaultMode.getModeId(),
		/allowGroupSwitching / false,
		new RefreshRateRange(fps, fps),
		new RefreshRateRange(fps, fps));
		}

		if (mModeSwitchingType == DisplayManager.SWITCHING_TYPE_NONE) {

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

+34 −0

Original line number	Diff line number	Diff line
		@@ -463,6 +463,40 @@ public class DisplayModeDirectorTest {
		assertThat(specs.baseModeId).isEqualTo(defaultModeId);
		}

		@Test
		public void testStaleAppRequestSize() {
		DisplayModeDirector director =
		new DisplayModeDirector(mContext, mHandler, mInjector);
		Display.Mode[] modes = new Display.Mode[] {
		new Display.Mode(1, 1280, 720, 60),
		};
		Display.Mode defaultMode = modes[0];

		// Inject supported modes
		SparseArray<Display.Mode[]> supportedModesByDisplay = new SparseArray<>();
		supportedModesByDisplay.put(DISPLAY_ID, modes);
		director.injectSupportedModesByDisplay(supportedModesByDisplay);

		// Inject default mode
		SparseArray<Display.Mode> defaultModesByDisplay = new SparseArray<>();
		defaultModesByDisplay.put(DISPLAY_ID, defaultMode);
		director.injectDefaultModeByDisplay(defaultModesByDisplay);

		// Inject votes
		SparseArray<Vote> votes = new SparseArray<>();
		votes.put(Vote.PRIORITY_APP_REQUEST_SIZE, Vote.forSize(1920, 1080));
		votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE, Vote.forRefreshRates(50, 50));
		SparseArray<SparseArray<Vote>> votesByDisplay = new SparseArray<>();
		votesByDisplay.put(DISPLAY_ID, votes);
		director.injectVotesByDisplay(votesByDisplay);

		director.setShouldAlwaysRespectAppRequestedMode(true);

		// We should return the only available mode
		DesiredDisplayModeSpecs specs = director.getDesiredDisplayModeSpecs(DISPLAY_ID);
		assertThat(specs.baseModeId).isEqualTo(defaultMode.getModeId());
		}

		@Test
		public void testBrightnessObserverGetsUpdatedRefreshRatesForZone() {
		DisplayModeDirector director =