Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Store and pull files from /sdcard/"

Browse Source
This commit is contained in:
Nataniel Borges
2020-12-03 08:59:51 +00:00
committed by Android (Google) Code Review
parent 53096b4cfc d43036b08c
commit cffd2d129c
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/FlickerTests/AndroidManifest.xml
View File

@@ -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 -->
@@ -34,7 +36,8 @@
<!-- Workaround grant runtime permission exception from b/152733071 -->
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
<uses-permission android:name="android.permission.READ_LOGS"/>
<application>
<!-- Allow the test to write directly to /sdcard/ -->
<application android:requestLegacyExternalStorage="true">
<uses-library android:name="android.test.runner"/>
</application>

2
tests/FlickerTests/AndroidTestPhysicalDevices.xml
View File

@@ -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.server.wm.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>

2
tests/FlickerTests/AndroidTestVirtualDevices.xml
View File

@@ -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.server.wm.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>

3
tests/SurfaceViewBufferTests/src/com/android/test/SurfaceTracingTestBase.kt
View File

@@ -52,7 +52,8 @@ open class SurfaceTracingTestBase(useBlastAdapter: Boolean) :
}
fun withTrace(predicate: (it: MainActivity) -> Unit): LayersTrace {
return withSFTracing(instrumentation, TRACE_FLAGS) {
return withSFTracing(TRACE_FLAGS,
outputDir = instrumentation.targetContext.dataDir.toPath()) {
scenarioRule.getScenario().onActivity {
predicate(it)
}

3
tests/TaskOrganizerTest/src/com/android/test/taskembed/ResizeTasksSyncTest.kt
View File

@@ -68,7 +68,8 @@ class ResizeTasksSyncTest {
val firstBounds = Rect(0, 0, 1080, 800)
val secondBounds = Rect(0, 1000, 1080, 1800)
val trace = withSFTracing(instrumentation, TRACE_FLAGS) {
val trace = withSFTracing(TRACE_FLAGS,
outputDir = instrumentation.targetContext.dataDir.toPath()) {
lateinit var resizeReadyLatch: CountDownLatch
scenarioRule.getScenario().onActivity {
resizeReadyLatch = it.resizeTaskView(firstBounds, secondBounds)