| commit | 928ab4657d2a888852de212d8041ac4ef35e74aa | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Mar 12 02:21:00 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 12 02:21:00 2025 -0700 |
| tree | f68b7f9aca31708a12c61a9f5219dae658470911 | |
| parent | 986a6deca42e3064ec1e080afc830f2a4e9a2e9c [diff] | |
| parent | ca91ebdcab512e0649a8f2f17153b84f4c647c18 [diff] |
Merge "Invoke tcpdump with -l" into main am: ca91ebdcab Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3509290 Change-Id: I884700af3faf545f1a4624e13792686e3b7da0ab 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 4b9429b..8a255c6 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/ConnectivityDiagnosticsCollector.kt
@@ -224,7 +224,7 @@ // Echo the current pid, and replace it (with exec) with the tcpdump process, so the // tcpdump pid is known. writer.write( - "echo $$; exec su 0 tcpdump -n -i any -U -xx".encodeToByteArray() + "echo $$; exec su 0 tcpdump -n -i any -l -xx".encodeToByteArray() ) } val reader = FileReader(stdout.fileDescriptor).buffered()