From 8b555c29c3114e910d2d4d94dff1aed2f91da9d5 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 26 Feb 2025 11:14:37 +0900 Subject: [PATCH] Collect diagnostics without storage permission Use the shell to open the output file instead of FileOutputStream. This allows test to use ConnectivityDiagnosticsCollector even if they do not have storage permissions. getOutputStreamViaShell is a method of the base class BaseMetricListener. Bug: 317602748 Test: atest Change-Id: I127bb6711d14fdee059a31a8a3cfddc44b1d7800 --- .../com/android/testutils/ConnectivityDiagnosticsCollector.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt b/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt index 4b9429b34a..07f3be5112 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt @@ -45,7 +45,6 @@ import com.android.modules.utils.build.SdkLevel.isAtLeastS import java.io.ByteArrayOutputStream import java.io.CharArrayWriter import java.io.File -import java.io.FileOutputStream import java.io.FileReader import java.io.OutputStream import java.io.OutputStreamWriter @@ -280,7 +279,7 @@ class ConnectivityDiagnosticsCollector : BaseMetricListener() { } val outFile = File(collectorDir, filename + FILENAME_SUFFIX) outputFiles.add(filename) - FileOutputStream(outFile).use { fos -> + getOutputStreamViaShell(outFile).use { fos -> failureHeader?.let { fos.write(it.toByteArray()) fos.write("\n".toByteArray())