Merge "Fix overriding ip configurtion with default one" into pi-dev am: 6f017e3319

am: 34c892c1d1

Change-Id: I98133ad41229b93f51ea3976d311f9896456a56c

service-t/src/com/android/server/ethernet/EthernetConfigStore.java

@@ -16,6 +16,7 @@
 
 package com.android.server.ethernet;
 
+import android.annotation.Nullable;
 import android.net.IpConfiguration;
 import android.os.Environment;
 import android.util.ArrayMap;
@@ -77,9 +78,11 @@ public class EthernetConfigStore {
         }
     }
 
+    @Nullable
     public IpConfiguration getIpConfigurationForDefaultInterface() {
         synchronized (mSync) {
-            return new IpConfiguration(mIpConfigurationForDefaultInterface);
+            return mIpConfigurationForDefaultInterface == null
+                    ? null : new IpConfiguration(mIpConfigurationForDefaultInterface);
         }
     }
 }