commit ae4431aadcad86739352675111ed389c6170e453
author Motomu Utsumi <motomuman@google.com> Wed Dec 07 07:29:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 07 07:29:54 2022 +0000
tree e98a9fb18e302ca87bd2eb483bec385637bb8fb7
parent 3b1703007efd3892191fbd71093efb3d5fa17224
parent 0e9c379c3e40d01a1bf597d6285da3701d397684

Merge "Enable java bpf map always in U devices"

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 aea2103..b8a8fb4 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -281,7 +281,7 @@
         if (sEnableJavaBpfMap == null) {
             sEnableJavaBpfMap = DeviceConfigUtils.isFeatureEnabled(context,
                     DeviceConfig.NAMESPACE_TETHERING, BPF_NET_MAPS_ENABLE_JAVA_BPF_MAP,
-                    SdkLevel.isAtLeastU() /* defaultValue */);
+                    false /* defaultValue */) || SdkLevel.isAtLeastU();
         }
         Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap);