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

Commit 2ed07b4e authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Store and pull files from /sdcard/ 

Tradefed FilePullerLogCollector can no longer access the internal app directory (e.g. /storage/emulated/0/Android/data/com.android.server.wm.flicker/files).

This makes it unable to pull trace files, when a test fails. This CL makes flicker tests store their data on /sdcard/flicker which can be accessed by the Tradefed FilePullerLogCollector

Bug: 171026227
Test: atest WMShellFlickerTests
Change-Id: Ie2329cbc475ee1be35e6bb3e274c96a4db142ac5
parent 0ea52e51

libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    <!-- Read and write traces from external storage -->

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <!-- Allow the test to write directly to /sdcard/ -->

    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />

    <!-- Write secure settings -->

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <!-- Capture screen contents -->
@@ -38,7 +40,8 @@ 
    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>

    <!-- ATM.removeRootTasksWithActivityTypes() -->

    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS" />

    <application>

    <!-- Allow the test to write directly to /sdcard/ -->

    <application android:requestLegacyExternalStorage="true">

        <uses-library android:name="android.test.runner"/>



        <service android:name=".NotificationListener"

libs/WindowManager/Shell/tests/flicker/AndroidTestPhysicalDevices.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        <option name="hidden-api-checks" value="false" />

    </test>

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="directory-keys" value="/storage/emulated/0/Android/data/com.android.wm.shell.flicker/files" />

        <option name="directory-keys" value="/sdcard/flicker" />

        <option name="collect-on-run-ended-only" value="true" />

        <option name="clean-up" value="true" />

    </metrics_collector>

libs/WindowManager/Shell/tests/flicker/AndroidTestVirtualDevices.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        <option name="hidden-api-checks" value="false" />

    </test>

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="directory-keys" value="/storage/emulated/0/Android/data/com.android.wm.shell.flicker/files" />

        <option name="directory-keys" value="/sdcard/flicker" />

        <option name="collect-on-run-ended-only" value="true" />

        <option name="clean-up" value="true" />

    </metrics_collector>