From 660c5eee79c9bd9c0d56a239b045c49cc8ee1599 Mon Sep 17 00:00:00 2001
From: Victor Hsieh <victorhsieh@google.com>
Date: Fri, 20 Dec 2019 09:43:23 -0800
Subject: [PATCH] Disable verifying apk installed from adb

Without this change, the verifier may hold the fd of installed apk and
prevents the cache eviction. The existing retry loop up to 5 seconds is
not sufficient.

Also removed an obsolete verifier setting.

Test: com.android.apkverity.ApkVerityTest#testInstallSplitOnly succeeded
      100% (75+ times).
Bug: 146350859

Change-Id: Ia7d42ab6efcb42de83626f1d63bff5a8adc6c1a6
---
 tests/ApkVerityTest/AndroidTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ApkVerityTest/AndroidTest.xml b/tests/ApkVerityTest/AndroidTest.xml
index 51bcdea21f49a..55704eda905e3 100644
--- a/tests/ApkVerityTest/AndroidTest.xml
+++ b/tests/ApkVerityTest/AndroidTest.xml
@@ -22,7 +22,7 @@
     <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
         <!-- Disable package verifier prevents it holding the target APK's fd that prevents cache
              eviction. -->
-        <option name="set-global-setting" key="package_verifier_enable" value="0" />
+        <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
         <option name="restore-settings" value="true" />
 
         <!-- Skip in order to prevent reboot that confuses the test flow. -->