LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "isTetheringFeatureNotChickenedOut" into main

Browse Source 
* changes:
  Use Java code path for bpf map operations in BpfNetMaps
  Rename to isTetheringFeatureNotChickenedOut
This commit is contained in:
Motomu Utsumi
2023-08-17 06:12:36 +00:00
committed by Gerrit Code Review
parent 69a18c6f90 7628ea30b0
commit 006020b83a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/com/android/server/BpfNetMaps.java
View File

@@ -43,7 +43,6 @@ import android.net.INetd;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.provider.DeviceConfig;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.util.ArraySet; import android.util.ArraySet;
@@ -95,8 +94,8 @@ public class BpfNetMaps {
private static boolean sInitialized = false; private static boolean sInitialized = false;
private static Boolean sEnableJavaBpfMap = null; private static Boolean sEnableJavaBpfMap = null;
private static final String BPF_NET_MAPS_ENABLE_JAVA_BPF_MAP = private static final String BPF_NET_MAPS_FORCE_DISABLE_JAVA_BPF_MAP =
"bpf_net_maps_enable_java_bpf_map"; "bpf_net_maps_force_disable_java_bpf_map";
// Lock for sConfigurationMap entry for UID_RULES_CONFIGURATION_KEY. // Lock for sConfigurationMap entry for UID_RULES_CONFIGURATION_KEY.
// This entry is not accessed by others. // This entry is not accessed by others.
@@ -283,9 +282,8 @@ public class BpfNetMaps {
if (sInitialized) return; if (sInitialized) return;
if (sEnableJavaBpfMap == null) { if (sEnableJavaBpfMap == null) {
sEnableJavaBpfMap = SdkLevel.isAtLeastU() || sEnableJavaBpfMap = SdkLevel.isAtLeastU() ||
DeviceConfigUtils.isFeatureEnabled(context, DeviceConfigUtils.isTetheringFeatureNotChickenedOut(
DeviceConfig.NAMESPACE_TETHERING, BPF_NET_MAPS_ENABLE_JAVA_BPF_MAP, BPF_NET_MAPS_FORCE_DISABLE_JAVA_BPF_MAP);
DeviceConfigUtils.TETHERING_MODULE_NAME, false /* defaultValue */);
} }
Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap); Log.d(TAG, "BpfNetMaps is initialized with sEnableJavaBpfMap=" + sEnableJavaBpfMap);

2
service/src/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -993,7 +993,7 @@ public class KeepaliveTracker {
*/ */
public boolean isAddressTranslationEnabled(@NonNull Context context) { public boolean isAddressTranslationEnabled(@NonNull Context context) {
return DeviceConfigUtils.isFeatureSupported(context, FEATURE_CLAT_ADDRESS_TRANSLATE) return DeviceConfigUtils.isFeatureSupported(context, FEATURE_CLAT_ADDRESS_TRANSLATE)
&& !DeviceConfigUtils.isTetheringFeatureForceDisabled( && DeviceConfigUtils.isTetheringFeatureNotChickenedOut(
CONFIG_DISABLE_CLAT_ADDRESS_TRANSLATE); CONFIG_DISABLE_CLAT_ADDRESS_TRANSLATE);
} }
} }