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

Commit ea789b7c authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Fix OverlayDeviceTests for un-rooted devices" into sc-dev am: b9c60d9a am: 54cc48ec 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b218740ec8e7fb07d6dac2b5518cb9a62909eb7
parents 6d68d221 54cc48ec

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" />