| commit | 6ef793e0f15e9de42a408564d60bb8792f99e6fa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 19 04:51:37 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 19 04:51:37 2025 -0700 |
| tree | a4f8a92a5add91eb6173b385f89f0e0838f144cc | |
| parent | 7692101949548b3fbc760490edca8ef69b9c72b4 [diff] | |
| parent | b9314970da9ea7f318657590e0273bd9e3e835fd [diff] |
Merge "BpfNetMaps: auto populate interface tracker" into main am: b9314970da Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3549344 Change-Id: I5a11dee634a6129fbf7710bf0b66a7b363950a8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) {