commit 4e4f8720f26e930dfe1e34fb6170eccb796e1d98
author Maciej Żenczykowski <maze@google.com> Sat Jun 15 06:38:08 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Fri Jun 21 15:47:00 2024 +0000
tree 23e4639060cc71e52ee8f6a6c62088d1429ab529
parent 2afffc2d6acf2d1322a09b71d03d9054d289c057

Revert "NetBpfLoad: disable mainline on < U QPR3"

This reverts commit 4b28336a7a35df561511b2124bca1a817daa9426.

Fixed trivial comment conflicts in netd/BpfHandler.cpp

This is targetting mainline release M-2024-09.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I048af33789590dda4e1f0be0660419ca6b3ad57f

netd/BpfHandler.cpp

diff --git a/netd/BpfHandler.cpp b/netd/BpfHandler.cpp
index 80f5869..4779b47 100644
--- a/netd/BpfHandler.cpp
+++ b/netd/BpfHandler.cpp
@@ -215,7 +215,7 @@
         android::bpf::waitForProgsLoaded();
     }
 
-    if (false && !mainlineNetBpfLoadDone()) {
+    if (!mainlineNetBpfLoadDone()) {
         // We're on < U QPR3 & it's the first time netd is starting up (unless crashlooping)
         //
         // On U QPR3+ netbpfload is guaranteed to run before the platform bpfloader,