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

Merge "Check whether feature is enabled by compare with apex version" am: 84a8a13a92

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708088

Change-Id: Iefbd6fa6a061614b83d115219f8939dee8794bb7
This commit is contained in:
Mark Chien
2021-05-18 03:37:13 +00:00
committed by Automerger Merge Worker
parent 9015e276aa 84a8a13a92
commit c59d6fa12d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tethering/src/com/android/networkstack/tethering/TetheringConfiguration.java
View File

@@ -58,6 +58,8 @@ public class TetheringConfiguration {
private static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final String[] EMPTY_STRING_ARRAY = new String[0];
private static final String TETHERING_MODULE_NAME = "com.android.tethering";
// Default ranges used for the legacy DHCP server. // Default ranges used for the legacy DHCP server.
// USB is 192.168.42.1 and 255.255.255.0 // USB is 192.168.42.1 and 255.255.255.0
// Wifi is 192.168.43.1 and 255.255.255.0 // Wifi is 192.168.43.1 and 255.255.255.0
@@ -473,7 +475,8 @@ public class TetheringConfiguration {
@VisibleForTesting @VisibleForTesting
protected boolean isFeatureEnabled(Context ctx, String featureVersionFlag) { protected boolean isFeatureEnabled(Context ctx, String featureVersionFlag) {
return DeviceConfigUtils.isFeatureEnabled(ctx, NAMESPACE_CONNECTIVITY, featureVersionFlag); return DeviceConfigUtils.isFeatureEnabled(ctx, NAMESPACE_CONNECTIVITY, featureVersionFlag,
TETHERING_MODULE_NAME, false /* defaultEnabled */);
} }
private Resources getResources(Context ctx, int subId) { private Resources getResources(Context ctx, int subId) {