| commit | 9ac6a3371c709cc4eebddcaefc1c2a6f5ebf5963 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Wed Dec 07 07:49:52 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 07 07:49:52 2022 +0000 |
| tree | ce015f1cc129f541c4c42bd8a6fbe3c6dada1c7e | |
| parent | 1311b29260a03fa1322add661c6521a198e1f52e [diff] | |
| parent | ae4431aadcad86739352675111ed389c6170e453 [diff] |
Merge "Enable java bpf map always in U devices" am: ae4431aadc Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2330094 Change-Id: I27888178aac3542af7700a86165134cbfb748c04 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);