1 files changed, 7 insertions, 11 deletions
diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java
index 2571fe6..794b5d1 100644
--- a/java/com/android/server/ethernet/EthernetTracker.java
+++ b/java/com/android/server/ethernet/EthernetTracker.java
@@ -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) {