Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06984ed0 authored by Victor Hsieh's avatar Victor Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Skip test unless ro.vendor.api_level >= 30" into udc-dev am: c73ad87f am: 91cc9f49 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22097764



Change-Id: I5c0c535b3016a36c4e4fb232327f64470a4eed13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6142e119 91cc9f49

tests/ApkVerityTest/AndroidTest.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,11 @@ 
<configuration description="APK fs-verity integration/regression test">

<configuration description="APK fs-verity integration/regression test">

    <option name="test-suite-tag" value="apct" />

    <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. -->

    <!-- This test requires root to write against block device. -->

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />