commit d95a0dafa80dce754bece4e866cf4da4a20f5789
author Motomu Utsumi <motomuman@google.com> Sat Sep 03 00:40:30 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Tue Sep 06 11:23:13 2022 +0900
tree 65498af35fd3192cb87cdb7ae9a9d42cc6d6d1c6
parent 3af8f0e8d6bf8b3820ccb2a9fb3a6392a5e80d1a

Switch SkDestroyListener based on the flag.

Switch existing C SkDestroyListener and new Java SkDestroyListener based
on the experiment flag.

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

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 97449f6..19c5a27 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -225,10 +225,14 @@
         Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap);
 
         initBpfMaps();
-        native_init(true /* startSkDestroyListener */);
+        native_init(!sEnableJavaBpfMap /* startSkDestroyListener */);
         sInitialized = true;
     }
 
+    public boolean isSkDestroyListenerRunning() {
+        return !sEnableJavaBpfMap;
+    }
+
     /**
      * Dependencies of BpfNetMaps, for injection in tests.
      */