commit 3ba232bcf0c1fcefc7f573a4ca8b293054ec8e4f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 15 23:03:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 15 23:03:46 2018 +0000
tree a4636c88be1c98afa11b74991cb57772fdbb07bf
parent 2c002de63839a7ce1ed334af2c75176c00e1e248
parent 27d7591acfc99be7909a0007b2ae8a04152c167b

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

java/com/android/server/ethernet/EthernetConfigStore.java

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 @@
         }
     }
 
+    @Nullable
     public IpConfiguration getIpConfigurationForDefaultInterface() {
         synchronized (mSync) {
-            return new IpConfiguration(mIpConfigurationForDefaultInterface);
+            return mIpConfigurationForDefaultInterface == null
+                    ? null : new IpConfiguration(mIpConfigurationForDefaultInterface);
         }
     }
 }