commit 55630d0dc8ad721d8cf46fd33a6b5cfdcef19d2d
author Motomu Utsumi <motomuman@google.com> Wed Jun 29 07:46:52 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Mon Jul 11 03:14:07 2022 +0000
tree 64041442358905fca0937a35edf2d881f5346757
parent 7392eb4f4cdec1ca54a3ba016c1d2b2e2cbcf214

Use java BpfMap in BpfNetMaps#addNiceApp

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

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