| commit | 92cc7db2f820acb325975a38acb199af862de343 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Mon Jul 04 09:55:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 04 09:55:57 2022 +0000 |
| tree | 1b3d5c37b0f525a37ad65bace2b17bb71dead986 | |
| parent | 29b87b830b44cddad5e13a2525ced0edb5dae11d [diff] | |
| parent | daf5cb64ccee21fae6902166660984facd20566b [diff] |
Log BPF programs & maps in bugreport am: daf5cb64cc Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2144639 Change-Id: Ibc11e6ae6eee1deaa07f716d46f720598d03ce31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 13fbc1a..36a1a17 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -3422,6 +3422,17 @@ pw.increaseIndent(); mNetworkActivityTracker.dump(pw); pw.decreaseIndent(); + + // pre-T is logged by netd. + if (SdkLevel.isAtLeastT()) { + pw.println(); + pw.println("BPF programs & maps:"); + pw.increaseIndent(); + // Flush is required. Otherwise, the traces in fd can interleave with traces in pw. + pw.flush(); + dumpTrafficController(pw, fd, /*verbose=*/ true); + pw.decreaseIndent(); + } } private void dumpNetworks(IndentingPrintWriter pw) {