Merge "FrameRateCtsActivity: don't try to set frame rate for different resolutions" into android14-tests-dev am: d956b2b am: e650595 am: 3ec7813

adyabr · android-build-merge-worker-robot · commit 14e930cc6d7f · 2023-11-29T19:42:17.000Z
Original change: https://android-review.googlesource.com/c/platform/cts/+/2850888 Change-Id: Ic93f2317cff90c0f054bf0cc7e87f408c5aaf9e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java b/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java
@@ -440,7 +440,8 @@ private List<Float> getSeamedRefreshRates(Display.Mode mode, Display display) {
         List<Float> seamedRefreshRates = new ArrayList<>();
         Display.Mode[] modes = display.getSupportedModes();
         for (Display.Mode otherMode : modes) {
-            if (!DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {
+            if (hasSameResolution(mode, otherMode)
+                    && !DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {
                 seamedRefreshRates.add(otherMode.getRefreshRate());
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,8 @@ private List<Float> getSeamedRefreshRates(Display.Mode mode, Display display) {`
`440`	`440`	`List<Float> seamedRefreshRates = new ArrayList<>();`
`441`	`441`	`Display.Mode[] modes = display.getSupportedModes();`
`442`	`442`	`for (Display.Mode otherMode : modes) {`
`443`		`- if (!DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {`
	`443`	`+ if (hasSameResolution(mode, otherMode)`
	`444`	`+ && !DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {`
`444`	`445`	`seamedRefreshRates.add(otherMode.getRefreshRate());`
`445`	`446`	`}`
`446`	`447`	`}`