commit 83f5f13c4b14c2ee47c3f0a54fe9adb6207879ff
author Keyi Gui <kgui@google.com> Wed Jul 23 10:19:02 2025 +0800
committer Keyi Gui <kgui@google.com> Thu Jul 24 16:23:36 2025 +0800
tree e214588b6091cb7024ec28a5d59e4264d7cac3cf
parent 8dcbef67f5a66a178cbbff8bda362ead7b79016f

Ensure CtsSurfaceControlTests only runs on SDK 36.

Test: noop
Bug: 432407946
Flag: EXEMPT test config change
Change-Id: I45154aa7dc573a43c7f6ea0849e32532d848087c

tests/surfacecontrol/AndroidTest.xml

diff --git a/tests/surfacecontrol/AndroidTest.xml b/tests/surfacecontrol/AndroidTest.xml
index 23e1993..265586a 100644
--- a/tests/surfacecontrol/AndroidTest.xml
+++ b/tests/surfacecontrol/AndroidTest.xml
@@ -35,6 +35,8 @@
         <option name="run-command" value="settings put secure immersive_mode_confirmations confirmed" />
         <option name="run-command" value="input keyevent KEYCODE_HOME" />
     </target_preparer>
+    <!-- Ensure the module only runs on the latest SDK -->
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk36ModuleController" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.view.surfacecontrol.cts" />
         <option name="runtime-hint" value="6m47s" />