commit 71cee5fc9e4f5ccaa626f10addcce1c604d157c8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 19 05:37:20 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 19 05:37:20 2025 -0700
tree 9246a487f135491277ea0d02c05e851f23f749ca
parent 01b35cd8190c56e9d019e1ca33a3364e30cd9e76
parent 6ef793e0f15e9de42a408564d60bb8792f99e6fa

Merge "BpfNetMaps: auto populate interface tracker" into main am: b9314970da am: 6ef793e0f1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3549344

Change-Id: I81be2aea85a85856e6c20a33c7640f6455bd45d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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) {