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

Commit 6c458c64 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0e am: 7a278ceb 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id35c028eb03a35c0255a35e30440d52c210250fe
parents 6bbb6b77 7a278ceb

core/tests/overlaytests/device/AndroidTest.xml

+2 −6
Original line number Diff line number Diff line
@@ -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" />