| commit | 63db36820c2218615c8246da08c08f5528fdff18 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Wed Dec 07 08:12:00 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 07 08:12:00 2022 +0000 |
| tree | 335f8bdc57cab39f31e865f3b4b9c8a3f50c23d2 | |
| parent | 07299976014a509ef3834ec248203fe4e2f5623a [diff] | |
| parent | 9ac6a3371c709cc4eebddcaefc1c2a6f5ebf5963 [diff] |
Merge "Enable java bpf map always in U devices" am: ae4431aadc am: 9ac6a3371c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2330094 Change-Id: I324ae8c0ca1521a6ff4724a627754c107506f19e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);