commit 7392eb4f4cdec1ca54a3ba016c1d2b2e2cbcf214
author Motomu Utsumi <motomuman@google.com> Wed Jun 29 03:53:03 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Mon Jul 11 03:14:07 2022 +0000
tree 7342db67b64bfb2a5938a34b984626b24a47221f
parent 389278ec8bab5891dc2ee9c02314d86c2790e0fb

Use java BpfMap in BpfNetMaps#removeNiceApp

Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I0433459ec43b6a84c4417152884d10fae5fecee6

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 be0eb5f..5618233 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -308,10 +308,8 @@
      *                                  cause of the failure.
      */
     public void removeNiceApp(final int uid) {
-        synchronized (sUidOwnerMap) {
-            final int err = native_removeNiceApp(uid);
-            maybeThrow(err, "Unable to remove nice app");
-        }
+        throwIfPreT("removeNiceApp is not available on pre-T devices");
+        removeRule(uid, HAPPY_BOX_MATCH, "removeNiceApp");
     }
 
     /**