Merge "Enable java bpf map always in U devices"

2022-12-07 07:29:54 +00:00
parent 3b1703007e 0e9c379c3e
commit ae4431aadc
1 changed files with 1 additions and 1 deletions
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -281,7 +281,7 @@ public class BpfNetMaps {
        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);