Skip to content

Commit e650595

Browse files
Merge "FrameRateCtsActivity: don't try to set frame rate for different resolutions" into android14-tests-dev am: d956b2b
Original change: https://android-review.googlesource.com/c/platform/cts/+/2850888 Change-Id: I3f2d295802729eb38bc6c8f87c814c24228e46ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents bfdf1a4 + d956b2b commit e650595

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ private List<Float> getSeamedRefreshRates(Display.Mode mode, Display display) {
440440
List<Float> seamedRefreshRates = new ArrayList<>();
441441
Display.Mode[] modes = display.getSupportedModes();
442442
for (Display.Mode otherMode : modes) {
443-
if (!DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {
443+
if (hasSameResolution(mode, otherMode)
444+
&& !DisplayUtil.isModeSwitchSeamless(mode, otherMode)) {
444445
seamedRefreshRates.add(otherMode.getRefreshRate());
445446
}
446447
}

0 commit comments

Comments
 (0)