joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Collect diagnostics without storage permission" into main am: 899737e0e0

Browse source 
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>
This commit is contained in:
Remi NGUYEN VAN 2025-03-18 02:32:33 -07:00 • committed by Automerger Merge Worker
commit 03dfa95c31
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt
View file

@ -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())