commit b9314970da9ea7f318657590e0273bd9e3e835fd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 19 04:44:30 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 19 04:44:30 2025 -0700
tree a4f8a92a5add91eb6173b385f89f0e0838f144cc
parent b0cad64f5fd02184c00220595bfc5307855f190d
parent cdac5e3d46d6f133ef0d55006b72278c7eda88e8

Merge "BpfNetMaps: auto populate interface tracker" into main

service/src/com/android/server/BpfNetMaps.java

diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index 923920f..9bd407d 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -915,10 +915,13 @@
             final InetAddress address, final int protocol, final int remotePort,
             final boolean isAllowed) {
         throwIfPre25Q2("addLocalNetAccess is not available on pre-B devices");
-        final int ifIndex;
         if (iface == null) {
-            ifIndex = 0;
-        } else {
+            Log.e(TAG, "Null iface, skip addLocalNetAccess for " + address);
+            return;
+        }
+        int ifIndex = mInterfaceTracker.getInterfaceIndex(iface);
+        if (ifIndex == 0) {
+            mInterfaceTracker.addInterface(iface);
             ifIndex = mInterfaceTracker.getInterfaceIndex(iface);
         }
         if (ifIndex == 0) {