Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev

2020-03-18 18:35:33 +00:00
parent a7dae49707 4a70ead56d
commit 0af18474b3
1 changed files with 2 additions and 1 deletions
--- a/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java
+++ b/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java
@@ -98,7 +98,8 @@ public class ApkVerityTest extends BaseHostJUnit4Test {
        mDevice = getDevice();

        String apkVerityMode = mDevice.getProperty("ro.apk_verity.mode");
-        assumeTrue(APK_VERITY_STANDARD_MODE.equals(apkVerityMode));
+        assumeTrue(mDevice.getLaunchApiLevel() >= 30
+                || APK_VERITY_STANDARD_MODE.equals(apkVerityMode));

        mKeyId = expectRemoteCommandToSucceed(
                "mini-keyctl padd asymmetric fsv_test .fs-verity < " + CERT_PATH).trim();