diff options
| author | Victor Hsieh <victorhsieh@google.com> | 2020-03-11 13:43:44 -0700 |
|---|---|---|
| committer | Victor Hsieh <victorhsieh@google.com> | 2020-03-18 16:44:57 +0000 |
| commit | 4a70ead56dd3290c4505585f11f8d79b0996d4c8 (patch) | |
| tree | b60cb22a3b5747c2c244a8b34f73871917d324bb /tests/ApkVerityTest/src | |
| parent | 5a563d287074fac4b3375380eb67fa09b53a4604 (diff) | |
Run ApkVerityTest if first api level >= 30
CDD requires new devices launching with R to support fs-verity.
Test: `atest ApkVerityTest` on device with first_api_level=30
Bug: 150641206
Change-Id: Ied831fa720fecc623dbac6bdbd1263856d2792ef
Diffstat (limited to 'tests/ApkVerityTest/src')
| -rw-r--r-- | tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java b/tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java index ae20cae36839..629b6c714ae8 100644 --- 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(); |