| commit | 03dfa95c3127121dc8ad05de23c67bcfb6a7d873 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Mar 18 02:32:33 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 18 02:32:33 2025 -0700 |
| tree | 87d062d2d23710452dc07f4ea3947ca48aad0439 | |
| parent | 58b5b18514d74ac83b27510f318a139e2b2683e0 [diff] | |
| parent | 899737e0e05349ab4f941e8efbaaeabe4ae4d73e [diff] |
Merge "Collect diagnostics without storage permission" into main am: 899737e0e0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3507715 Change-Id: Icca06de94d387f2bb22f4727c26c75edb19e2a2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt b/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt index 8a255c6..60285a8 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt
@@ -45,7 +45,6 @@ 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 @@ } 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())