commit b5cf87f7712c7dcdf138c68b70c8ea2718082d2d
author Pavel Maltsev <pavelm@google.com> Mon May 07 10:32:59 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 07 10:32:59 2018 -0700
tree de535f49f870036a4a93399b1e986baee08c8745
parent 8a98197771fc8542825a50ffeb5f990576cc267b
parent 97446b8978e0c56d29329e190cadcd964e8bf93d

Fix NPE during dumpsys ethernet
am: 97446b8978

Change-Id: I374a91265660e814b4f0f033b3970fd98921ca84

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();