commit afebcc8608cfdeee12c06b99d44426e42e650c70
author Treehugger Robot <treehugger-gerrit@google.com> Sun Sep 18 19:17:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Sep 18 19:17:32 2022 +0000
tree c37dd7feace440cb6c61d71ea1eda94f956eba48
parent ecb0b3cab35a72f95884b3f2f84e1b323ae7fed8
parent e4f45ab956ed9700d2cba8fc0a0bbba386101f0f

Merge "Revert "Log BPF programs & maps in bugreport""

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 7cf461e..9322172 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3350,17 +3350,6 @@
         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) {