commit a4344aea90d1cf4df23fba43194ad90f2756f855
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 21 17:49:57 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 17:49:57 2025 -0800
tree 292860e2a63cb575f882e500c36d2b4a169eab85
parent 60cd2e5c15aa869b6d590f38430218720c2d9ef2
parent cb46999cecc59d4c64746e2b79185fcb40842b91

Merge changes I4a3d0a27,I032c8d93,I9efd5ea3 into main

* changes:
  bpf netd: hardcode AID_ROOT/AID_ROOT in DEFINE_NETD_V_BPF_PROG_KVER
  bpf netd: hardcode AID_ROOT/AID_NET_ADMIN in DEFINE_SYS_BPF_PROG
  bpf netd: hardcode AID_ROOT/AID_NET_ADMIN in DEFINE_XTBPF_PROG

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;