joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Treehugger Robot 2025-03-19 04:51:37 -07:00 • committed by Automerger Merge Worker
commit 6ef793e0f1
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
service/src/com/android/server/BpfNetMaps.java
View file

@ -915,10 +915,13 @@ public class BpfNetMaps {
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) {