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

Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0eb6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e579f828a14909d5dba4492358d673790b2d41e
This commit is contained in:
Treehugger Robot
2021-02-19 03:31:49 +00:00
committed by Automerger Merge Worker
parent 7cccd926a9 41663a0eb6
commit 7a278ceb40
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/tests/overlaytests/device/AndroidTest.xml
View File

@@ -19,17 +19,13 @@
<option name="test-suite-tag" value="apct" /> <option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-instrumentation" /> <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"> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" /> <option name="cleanup" value="true" />
<option name="remount-system" value="true" /> <option name="remount-system" value="true" />
<option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" /> <option name="push" value="OverlayDeviceTests.apk->/system/app/OverlayDeviceTests.apk" />
</target_preparer> </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
<!-- 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.TestAppInstallSetup"> <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
<option name="cleanup-apks" value="true" /> <option name="cleanup-apks" value="true" />