diff options
| author | 2020-07-15 20:59:36 +0200 | |
|---|---|---|
| committer | 2020-07-16 18:03:26 +0200 | |
| commit | 3bc59bb03b63e837938a692983ab4991580dc3b6 (patch) | |
| tree | 55f7326ae0d162195f34e1970c5f224c5e65735a | |
| parent | 6429892ea96938dcd4387d5cc091ab12de8bfc5e (diff) | |
Use Android Q compatible external dir
We previously used Environment.getExternalDir to obtain the output dir for the tests. However, since Android Q this method is deprecated and returns an invalid path, leading to errors. Replace this method for context.getExternalDir(null) that return a Q friendly path.
Test: atest FlickerTests
Bug: 161341377
Change-Id: I5389ac6116b2b74fb19417683dbcfca604ca5b58
| -rw-r--r-- | tests/FlickerTests/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/FlickerTests/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/FlickerTests/AndroidManifest.xml b/tests/FlickerTests/AndroidManifest.xml index e0bd66580ec4..98e02ced8d0b 100644 --- a/tests/FlickerTests/AndroidManifest.xml +++ b/tests/FlickerTests/AndroidManifest.xml @@ -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" /> diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml index d83ee3a29381..58df2a806a1e 100644 --- a/tests/FlickerTests/AndroidTest.xml +++ b/tests/FlickerTests/AndroidTest.xml @@ -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> diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml index 7770c73d7a73..4d2144061ad4 100644 --- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml +++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml @@ -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" |