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

Using a builder for eth requests am: 7448a982fa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1990771

Change-Id: If14c6c1cc6cd7a76ea7cb04ccb20dde7f0f9867a
This commit is contained in:
James Mattis
2022-02-28 17:12:47 +00:00
committed by Automerger Merge Worker
parent c4ca1b7aae 7448a982fa
commit 40b1b0ccd2
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 // TODO: validate that iface is listed in overlay config_ethernet_interfaces
mTracker.updateConfiguration( mTracker.updateConfiguration(
iface, request.getIpConfig(), request.getNetworkCapabilities(), listener); iface, request.getIpConfiguration(), request.getNetworkCapabilities(), listener);
} }
@Override @Override

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

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

9
tests/ethernet/java/com/android/server/ethernet/EthernetServiceImplTest.java
View File

@@ -32,7 +32,6 @@ import android.net.IEthernetNetworkManagementListener;
import android.net.EthernetNetworkUpdateRequest; import android.net.EthernetNetworkUpdateRequest;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.StaticIpConfiguration;
import android.os.Handler; import android.os.Handler;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -49,8 +48,10 @@ import org.mockito.MockitoAnnotations;
public class EthernetServiceImplTest { public class EthernetServiceImplTest {
private static final String TEST_IFACE = "test123"; private static final String TEST_IFACE = "test123";
private static final EthernetNetworkUpdateRequest UPDATE_REQUEST = private static final EthernetNetworkUpdateRequest UPDATE_REQUEST =
new EthernetNetworkUpdateRequest( new EthernetNetworkUpdateRequest.Builder()
new StaticIpConfiguration(), new NetworkCapabilities.Builder().build()); .setIpConfiguration(new IpConfiguration())
.setNetworkCapabilities(new NetworkCapabilities.Builder().build())
.build();
private static final IEthernetNetworkManagementListener NULL_LISTENER = null; private static final IEthernetNetworkManagementListener NULL_LISTENER = null;
private EthernetServiceImpl mEthernetServiceImpl; private EthernetServiceImpl mEthernetServiceImpl;
@Mock private Context mContext; @Mock private Context mContext;
@@ -214,7 +215,7 @@ public class EthernetServiceImplTest {
mEthernetServiceImpl.updateConfiguration(TEST_IFACE, UPDATE_REQUEST, NULL_LISTENER); mEthernetServiceImpl.updateConfiguration(TEST_IFACE, UPDATE_REQUEST, NULL_LISTENER);
verify(mEthernetTracker).updateConfiguration( verify(mEthernetTracker).updateConfiguration(
eq(TEST_IFACE), eq(TEST_IFACE),
eq(UPDATE_REQUEST.getIpConfig()), eq(UPDATE_REQUEST.getIpConfiguration()),
eq(UPDATE_REQUEST.getNetworkCapabilities()), eq(NULL_LISTENER)); eq(UPDATE_REQUEST.getNetworkCapabilities()), eq(NULL_LISTENER));
} }

11
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -324,15 +324,18 @@ public class EthernetTrackerTest {
@Test @Test
public void testUpdateConfiguration() { public void testUpdateConfiguration() {
final NetworkCapabilities capabilities = new NetworkCapabilities.Builder().build(); final NetworkCapabilities capabilities = new NetworkCapabilities.Builder().build();
final StaticIpConfiguration staticIpConfig = new StaticIpConfiguration(); final LinkAddress linkAddr = new LinkAddress("192.0.2.2/25");
final StaticIpConfiguration staticIpConfig =
new StaticIpConfiguration.Builder().setIpAddress(linkAddr).build();
final IpConfiguration ipConfig =
new IpConfiguration.Builder().setStaticIpConfiguration(staticIpConfig).build();
final IEthernetNetworkManagementListener listener = null; final IEthernetNetworkManagementListener listener = null;
tracker.updateConfiguration(TEST_IFACE, staticIpConfig, capabilities, listener); tracker.updateConfiguration(TEST_IFACE, ipConfig, capabilities, listener);
waitForIdle(); waitForIdle();
verify(mFactory).updateInterface( verify(mFactory).updateInterface(
eq(TEST_IFACE), eq(EthernetTracker.createIpConfiguration(staticIpConfig)), eq(TEST_IFACE), eq(ipConfig), eq(capabilities), eq(listener));
eq(capabilities), eq(listener));
} }
@Test @Test