commit 3af8f0e8d6bf8b3820ccb2a9fb3a6392a5e80d1a
author Motomu Utsumi <motomuman@google.com> Fri Sep 02 23:42:13 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Tue Sep 06 11:23:13 2022 +0900
tree 043cd1a37a74167fcfc47f0a3a0bccce79b4fd54
parent 116af0d892153a58950d9a0f02a16b1f29091b0d

Add startSkDestroyListener flag to native_init

This CL prepares for upcoming CL.
Upcoming CL will add SkDestroyListener with Java BpfMap and switch
current C SkDestroyListener and new Java SkDestroyListener based on the
experiment flag.

Bug: 217624062
Test: atest SkDestroyListenerTest
Change-Id: I5ebb319d1b2262199d4ef6a3549894fee24c4ccf

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 dc5c4c7..97449f6 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -225,7 +225,7 @@
         Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap);
 
         initBpfMaps();
-        native_init();
+        native_init(true /* startSkDestroyListener */);
         sInitialized = true;
     }
 
@@ -839,7 +839,7 @@
         native_dump(fd, verbose);
     }
 
-    private static native void native_init();
+    private static native void native_init(boolean startSkDestroyListener);
     private native int native_addNaughtyApp(int uid);
     private native int native_removeNaughtyApp(int uid);
     private native int native_addNiceApp(int uid);