From 2a911d6c18609e5e0723f4c57a7889d06bc44e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Sun, 16 Jun 2024 03:31:38 -0700 Subject: [PATCH] Revert "Add a Log.wtf() on user builds to test Pitot reporting pipeline" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9161b153b47013577499d1348cc57e1716cb2c55. This is targetting mainline release M-2024-09. Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I3d053f8c006eee8c1cbc7918f6fc5e30f5d09375 --- service/src/com/android/server/ConnectivityService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index be1d3c7c7c..54fc32264c 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -393,7 +393,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Objects; -import java.util.Random; import java.util.Set; import java.util.SortedSet; import java.util.StringJoiner; @@ -1848,11 +1847,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // Temporary hack to report netbpfload result. // TODO: remove in 2024-09 when netbpfload starts loading mainline bpf programs. mHandler.postDelayed(() -> { - // Test Pitot pipeline, ignore this Log.wtf if it shows up in the logs. - final Random r = new Random(); - if (Build.TYPE.equals("user") && r.nextInt(1000) == 0) { - Log.wtf(TAG, "NOT A FAILURE, PLEASE IGNORE! Test Pitot pipeline works correctly"); - } // Did netbpfload create the map? try { Os.access("/sys/fs/bpf/net_shared/map_gentle_test", F_OK);