diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-19 01:12:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-19 01:12:21 +0000 |
| commit | 41663a0eb6aa2ec53555ee70298e08a7d81818ff (patch) | |
| tree | c4eebeca159ebcfef12656640163280a1cb0a5b5 | |
| parent | bf16b6d3996dd2e0bf2fd8410712afc1eb63892f (diff) | |
| parent | de8d74fb77f4e8f519bb3ed28d41bbda9a248183 (diff) | |
Merge "Fix OverlayDeviceTests for un-rooted devices"
| -rw-r--r-- | core/tests/overlaytests/device/AndroidTest.xml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/tests/overlaytests/device/AndroidTest.xml b/core/tests/overlaytests/device/AndroidTest.xml index ebbdda559ed2..2d7d9b450c8c 100644 --- a/core/tests/overlaytests/device/AndroidTest.xml +++ b/core/tests/overlaytests/device/AndroidTest.xml @@ -19,17 +19,13 @@ <option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct-instrumentation" /> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> <option name="remount-system" value="true" /> <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" /> </target_preparer> - - <!-- Reboot to have the test APK scanned by PM and reboot after to remove the test APK. --> - <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer"> - <option name="pre-reboot" value="true" /> - <option name="post-reboot" value="true" /> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" /> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> <option name="cleanup-apks" value="true" /> |