commit a8ed3da6b5b30afc0002b7ad28528bacffd6c85d
author Pavel Maltsev <pavelm@google.com> Tue May 08 03:32:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 08 03:32:27 2018 -0700
tree 5164fbb7888f90ec61911f2585313d63df1f428a
parent 206f8c6993e3d4716391ffc1619ef05158eb00e6
parent aea0136d01ab31ed7cde6a2bec6d4b99561d5f42

Fix NPE during dumpsys ethernet
am: aea0136d01

Change-Id: Iaba04ea0a6ffc07a289b93cc3bf2192fcf9fb1c2

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

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index f95500e..de0a691 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/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();