diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-01-29 14:08:37 -0800 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2021-02-18 23:56:24 +0000 |
| commit | de8d74fb77f4e8f519bb3ed28d41bbda9a248183 (patch) | |
| tree | 81b62f3868c8732f46da3349f2ff05b2f2e5abbc /core/tests | |
| parent | d7d4b0ca85f3e12e8884cba997042bb309f25d45 (diff) | |
Fix OverlayDeviceTests for un-rooted devices
The AndroidText.xml needs the root preparer to run on non-rooted
devices.
Bug: 177115481
Bug: 180623619
Test: adb unroot && atest OverlayDeviceTests
Change-Id: I4377207428182fbb76c09abef248b69eeae6acf5
Merged-In: I4377207428182fbb76c09abef248b69eeae6acf5
Diffstat (limited to 'core/tests')
| -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" /> |