commit 599c4e5cf4a244449eaa0b1ece0acabee7eb3d2f
author Motomu Utsumi <motomuman@google.com> Thu Jun 30 03:37:18 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Wed Jul 13 11:12:19 2022 +0000
tree 596608f2e85b456449bd7bce10ecbfd86ee435ce
parent 5f52f4f2fbd6ec3fbe7ecc9c286750935ed0788f

Use java BpfMap in removeUidInterfaceRules

Bug: 217624062
Test: atest BpfNetMapsTest HostsideVpnTests#testBlockIncomingPacket
Change-Id: I253c75aaeabe138a4f9d57c226744f5766ef1006

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 f0e9ec4..648ada2 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -477,9 +477,12 @@
             mNetd.firewallRemoveUidInterfaceRules(uids);
             return;
         }
-        synchronized (sUidOwnerMap) {
-            final int err = native_removeUidInterfaceRules(uids);
-            maybeThrow(err, "Unable to remove uid interface rules");
+        for (final int uid: uids) {
+            try {
+                removeRule(uid, IIF_MATCH, "removeUidInterfaceRules");
+            } catch (ServiceSpecificException e) {
+                Log.e(TAG, "removeRule failed uid=" + uid + ", " + e);
+            }
         }
     }