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

Commit cef8db0c authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Use Android Q compatible external dir"

parents fd31a318 3bc59bb0

tests/FlickerTests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.server.wm.flicker">



    <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>

    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29"/>

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

tests/FlickerTests/AndroidTest.xml

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

    </test>

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

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

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

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

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

    </metrics_collector>

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="com.android.server.wm.flicker.testapp">



    <uses-sdk android:minSdkVersion="17"

         android:targetSdkVersion="27"/>

    <uses-sdk android:minSdkVersion="29"

         android:targetSdkVersion="29"/>

    <application android:allowBackup="false"

         android:supportsRtl="true">

        <activity android:name=".SimpleActivity"