commit 91748dec077a43b0dfe355ec1ef59a1e8b15b98c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 21 17:50:38 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 17:50:38 2025 -0800
tree b3e2c0f8a002ddd83fa71b2a134fd17062a796e9
parent a4344aea90d1cf4df23fba43194ad90f2756f855
parent 40c967577d2b4df63e39da01b2a7d236bd29da7c

Merge changes Ie660ab98,If1066f10 into main

* changes:
  bpf netd: introduce DEFINE_NETD_BPF_PROG_RANGES() macro
  bpf netd: hardcode AID_ROOT/AID_ROOT in DEFINE_NETD_BPF_PROG{,_KVER,_KVER_RANGE}

staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java

diff --git a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java
index e2544d3..0d96fc4 100644
--- a/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java
+++ b/staticlibs/device/com/android/net/module/util/netlink/NetlinkUtils.java
@@ -83,7 +83,7 @@
     public static final int INET_DIAG_INFO = 2;
     public static final int INET_DIAG_MARK = 15;
 
-    public static final long IO_TIMEOUT_MS = 300L;
+    public static final long IO_TIMEOUT_MS = 3000L;
 
     public static final int DEFAULT_RECV_BUFSIZE = 8 * 1024;
     public static final int SOCKET_RECV_BUFSIZE = 64 * 1024;