From ec6dc4a91477b78111306a15d344ad0e6cafe133 Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Wed, 15 Mar 2023 08:36:40 -0700
Subject: [PATCH] Skip test unless ro.vendor.api_level >= 30

Fixes: 261775990
Test: `atest ApkVerityTest` on Pixel 7, saw the tests still ran
Change-Id: I62fe6079a80d94c7d5602862120b3510c044573b
---
 tests/ApkVerityTest/AndroidTest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/ApkVerityTest/AndroidTest.xml b/tests/ApkVerityTest/AndroidTest.xml
index 2a0a2c76e50f8..4487cefb4f9cf 100644
--- a/tests/ApkVerityTest/AndroidTest.xml
+++ b/tests/ApkVerityTest/AndroidTest.xml
@@ -16,6 +16,11 @@
 <configuration description="APK fs-verity integration/regression test">
     <option name="test-suite-tag" value="apct" />
 
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.ShippingApiLevelModuleController">
+        <!-- fs-verity is required since R/30 -->
+        <option name="vsr-min-api-level" value="30" />
+    </object>
+
     <!-- This test requires root to write against block device. -->
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />