| commit | cfc67e7df8c1d1745ef24c2148c93d3609967cb5 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Mar 12 02:57:14 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 12 02:57:14 2025 -0700 |
| tree | 4c54a7bca3d619d51cc3bfafc27203d59ec0b7f3 | |
| parent | d93681fb4b1b4f61c6e2fd076bab3930b775bb29 [diff] | |
| parent | 928ab4657d2a888852de212d8041ac4ef35e74aa [diff] |
Merge "Invoke tcpdump with -l" into main am: ca91ebdcab am: 928ab4657d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3509290 Change-Id: I0a2f433a38f45d3133e347d1aa19cb3cfc751869 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()