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/EthernetNetworkFactory.java

diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java
index f95500e..de0a691 100644
--- a/java/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -440,7 +440,12 @@
             NetworkInterfaceState ifaceState = mTrackingInterfaces.get(iface);
             pw.println(iface + ":" + ifaceState);
             pw.increaseIndent();
-            ifaceState.mIpClient.dump(fd, pw, args);
+            final IpClient ipClient = ifaceState.mIpClient;
+            if (ipClient != null) {
+                ipClient.dump(fd, pw, args);
+            } else {
+                pw.println("IpClient is null");
+            }
             pw.decreaseIndent();
         }
         pw.decreaseIndent();