Merge "Fix overriding ip configurtion with default one" into pi-dev

1 files changed, 4 insertions, 1 deletions

diff --git a/java/com/android/server/ethernet/EthernetConfigStore.java b/java/com/android/server/ethernet/EthernetConfigStore.java
index 6445603..6b623f4 100644
--- a/java/com/android/server/ethernet/EthernetConfigStore.java
+++ b/java/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);
         }
     }
 }