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

Commit 15fa84f2 authored by Victor Hsieh's avatar Victor Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am: 0af18474... 

Merge "Run ApkVerityTest if first api level >= 30" into rvc-dev am: 0af18474 am: 925ad83e am: fb084e15

Change-Id: I61bc5bc18e2eb25e73da39f5832230ab42136b42
parents 3c886f16 fb084e15

tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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();