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

Using a builder for eth requests

Browse Source 
Updating ethernet classes to use a builder when creating an
EthernetNetworkUpdateRequest and also changing to use
IpConfiguration instead of StaticIpConfiguration for the
UpdateConfiguration API.

Bug: 220017952
Bug: 210487893
Bug: 210485380
Test: atest EthernetServiceTests
Change-Id: I2647115bf867dfaa3f3dadf00e3c875aa7e8d88f
This commit is contained in:
James Mattis
2022-02-17 13:08:20 -08:00
parent ef20ec8f12
commit 7448a982fa
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
View File

@@ -239,7 +239,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
// TODO: validate that iface is listed in overlay config_ethernet_interfaces
mTracker.updateConfiguration(
iface, request.getIpConfig(), request.getNetworkCapabilities(), listener);
iface, request.getIpConfiguration(), request.getNetworkCapabilities(), listener);
}
@Override

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

@@ -229,18 +229,18 @@ public class EthernetTracker {
@VisibleForTesting(visibility = PACKAGE)
protected void updateConfiguration(@NonNull final String iface,
@NonNull final StaticIpConfiguration staticIpConfig,
@NonNull final IpConfiguration ipConfig,
@NonNull final NetworkCapabilities capabilities,
@Nullable final IEthernetNetworkManagementListener listener) {
if (DBG) {
Log.i(TAG, "updateConfiguration, iface: " + iface + ", capabilities: " + capabilities
+ ", staticIpConfig: " + staticIpConfig);
+ ", ipConfig: " + ipConfig);
}
final IpConfiguration ipConfig = createIpConfiguration(staticIpConfig);
writeIpConfiguration(iface, ipConfig);
final IpConfiguration localIpConfig = new IpConfiguration(ipConfig);
writeIpConfiguration(iface, localIpConfig);
mNetworkCapabilities.put(iface, capabilities);
mHandler.post(() -> {
mFactory.updateInterface(iface, ipConfig, capabilities, listener);
mFactory.updateInterface(iface, localIpConfig, capabilities, listener);
broadcastInterfaceStateChange(iface);
});
}
@@ -715,13 +715,9 @@ public class EthernetTracker {
return createIpConfiguration(staticIpConfigBuilder.build());
}
static IpConfiguration createIpConfiguration(
private static IpConfiguration createIpConfiguration(
@NonNull final StaticIpConfiguration staticIpConfig) {
final IpConfiguration ret = new IpConfiguration();
ret.setIpAssignment(IpAssignment.STATIC);
ret.setProxySettings(ProxySettings.NONE);
ret.setStaticIpConfiguration(staticIpConfig);
return ret;
return new IpConfiguration.Builder().setStaticIpConfiguration(staticIpConfig).build();
}
private IpConfiguration getOrCreateIpConfiguration(String iface) {