commit e4f45ab956ed9700d2cba8fc0a0bbba386101f0f
author Ken Chen <cken@google.com> Mon Aug 22 07:59:28 2022 +0000
committer Ken Chen <cken@google.com> Mon Aug 22 08:02:32 2022 +0000
tree c1b5b1655b61ed2191d323832b96ee6d58c32194
parent daf5cb64ccee21fae6902166660984facd20566b

Revert "Log BPF programs & maps in bugreport"

This reverts commit daf5cb64ccee21fae6902166660984facd20566b.

Reason for revert: dumpstate has the same information

Bug: 243313712
Change-Id: Ie8283cd942bff6ef9dbb66e5926bf650bd56997f

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 7948400..b210bb3 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3422,17 +3422,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) {