commit b49f10e22fc0f504a11874f1e2da0ef24e581abc
author android-build-team Robot <android-build-team-robot@google.com> Tue May 08 07:25:08 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 08 07:25:08 2018 +0000
tree de535f49f870036a4a93399b1e986baee08c8745
parent 1515724f8300ed8c4552282fb259261de7f833cb
parent 97446b8978e0c56d29329e190cadcd964e8bf93d

Snap for 4767765 from 97446b8978e0c56d29329e190cadcd964e8bf93d to pi-release

Change-Id: I374d7500bd788530d544402409af579ae3befde4

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