Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am: 0af18474b3 am: 925ad83ed4 am: fb084e15c3

Browse Source 
Change-Id: I61bc5bc18e2eb25e73da39f5832230ab42136b42
This commit is contained in:
Victor Hsieh
2020-03-18 19:16:38 +00:00
committed by Automerger Merge Worker
parent 3c886f1691 fb084e15c3
commit 15fa84f297
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java
View File

@@ -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();