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

Remove the legacy ethernet config resource check.

Browse Source 
The legacy ethernet config resource check isn't required any more
when the legacy resource cleanup in outside callers finishes, just
read the resource config from Connectivity module, but the value
still can be overlaid with pre-built RRO.

Bug: 214348333
Test: atest FrameworksNetTests
Change-Id: I86f6229343f9d48f0bd822e8086bdc880b81135f
This commit is contained in:
Xiao Ma
2022-04-12 23:45:22 +09:00
parent bebd8b0b54
commit b8e0167935
2 changed files with 8 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -19,7 +19,6 @@ package com.android.server.ethernet;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivityResources; import android.net.ConnectivityResources;
import android.net.EthernetManager; import android.net.EthernetManager;
@@ -71,8 +70,6 @@ public class EthernetNetworkFactory extends NetworkFactory {
private final static int NETWORK_SCORE = 70; private final static int NETWORK_SCORE = 70;
private static final String NETWORK_TYPE = "Ethernet"; private static final String NETWORK_TYPE = "Ethernet";
private static final String LEGACY_TCP_BUFFER_SIZES =
"524288,1048576,3145728,524288,1048576,2097152";
private final ConcurrentHashMap<String, NetworkInterfaceState> mTrackingInterfaces = private final ConcurrentHashMap<String, NetworkInterfaceState> mTrackingInterfaces =
new ConcurrentHashMap<>(); new ConcurrentHashMap<>();
@@ -99,25 +96,9 @@ public class EthernetNetworkFactory extends NetworkFactory {
return InterfaceParams.getByName(name); return InterfaceParams.getByName(name);
} }
// TODO: remove legacy resource fallback after migrating its overlays.
private String getPlatformTcpBufferSizes(Context context) {
final Resources r = context.getResources();
final int resId = r.getIdentifier("config_ethernet_tcp_buffers", "string",
context.getPackageName());
return r.getString(resId);
}
public String getTcpBufferSizesFromResource(Context context) { public String getTcpBufferSizesFromResource(Context context) {
final String tcpBufferSizes; final ConnectivityResources resources = new ConnectivityResources(context);
final String platformTcpBufferSizes = getPlatformTcpBufferSizes(context); return resources.get().getString(R.string.config_ethernet_tcp_buffers);
if (!LEGACY_TCP_BUFFER_SIZES.equals(platformTcpBufferSizes)) {
// Platform resource is not the historical default: use the overlay.
tcpBufferSizes = platformTcpBufferSizes;
} else {
final ConnectivityResources resources = new ConnectivityResources(context);
tcpBufferSizes = resources.get().getString(R.string.config_ethernet_tcp_buffers);
}
return tcpBufferSizes;
} }
} }

46
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -25,7 +25,6 @@ import static com.android.internal.annotations.VisibleForTesting.Visibility.PACK
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.net.ConnectivityResources; import android.net.ConnectivityResources;
import android.net.EthernetManager; import android.net.EthernetManager;
import android.net.IEthernetServiceListener; import android.net.IEthernetServiceListener;
@@ -86,7 +85,6 @@ public class EthernetTracker {
private static final boolean DBG = EthernetNetworkFactory.DBG; private static final boolean DBG = EthernetNetworkFactory.DBG;
private static final String TEST_IFACE_REGEXP = TEST_TAP_PREFIX + "\\d+"; private static final String TEST_IFACE_REGEXP = TEST_TAP_PREFIX + "\\d+";
private static final String LEGACY_IFACE_REGEXP = "eth\\d";
/** /**
* Interface names we track. This is a product-dependent regular expression, plus, * Interface names we track. This is a product-dependent regular expression, plus,
@@ -134,48 +132,16 @@ public class EthernetTracker {
} }
public static class Dependencies { public static class Dependencies {
// TODO: remove legacy resource fallback after migrating its overlays.
private String getPlatformRegexResource(Context context) {
final Resources r = context.getResources();
final int resId =
r.getIdentifier("config_ethernet_iface_regex", "string", context.getPackageName());
return r.getString(resId);
}
// TODO: remove legacy resource fallback after migrating its overlays.
private String[] getPlatformInterfaceConfigs(Context context) {
final Resources r = context.getResources();
final int resId = r.getIdentifier("config_ethernet_interfaces", "array",
context.getPackageName());
return r.getStringArray(resId);
}
public String getInterfaceRegexFromResource(Context context) { public String getInterfaceRegexFromResource(Context context) {
final String platformRegex = getPlatformRegexResource(context); final ConnectivityResources resources = new ConnectivityResources(context);
final String match; return resources.get().getString(
if (!LEGACY_IFACE_REGEXP.equals(platformRegex)) { com.android.connectivity.resources.R.string.config_ethernet_iface_regex);
// Platform resource is not the historical default: use the overlay
match = platformRegex;
} else {
final ConnectivityResources resources = new ConnectivityResources(context);
match = resources.get().getString(
com.android.connectivity.resources.R.string.config_ethernet_iface_regex);
}
return match;
} }
public String[] getInterfaceConfigFromResource(Context context) { public String[] getInterfaceConfigFromResource(Context context) {
final String[] platformInterfaceConfigs = getPlatformInterfaceConfigs(context); final ConnectivityResources resources = new ConnectivityResources(context);
final String[] interfaceConfigs; return resources.get().getStringArray(
if (platformInterfaceConfigs.length != 0) { com.android.connectivity.resources.R.array.config_ethernet_interfaces);
// Platform resource is not the historical default: use the overlay
interfaceConfigs = platformInterfaceConfigs;
} else {
final ConnectivityResources resources = new ConnectivityResources(context);
interfaceConfigs = resources.get().getStringArray(
com.android.connectivity.resources.R.array.config_ethernet_interfaces);
}
return interfaceConfigs;
} }
} }