commit aea0136d01ab31ed7cde6a2bec6d4b99561d5f42
author Pavel Maltsev <pavelm@google.com> Sat Apr 28 23:23:26 2018 -0700
committer Erik Kline <ek@google.com> Tue May 08 16:48:32 2018 +0900
tree 5164fbb7888f90ec61911f2585313d63df1f428a
parent 7048285cb3a9e618aea65d21f3f74c49dbde0b4d

Fix NPE during dumpsys ethernet

Handle the case when IpClient wasn't created for network interface which
may happen for virtual device

Bug: 78482534
Test: dumpsys ethernet
Merged-In: I374a91265660e814b4f0f033b3970fd98921ca84
Merged-In: Id4ab7c9a8a5238491c8405ae260862e76a7671c1
Change-Id: I3405dd4f72d4a6444448f0d6ec0497aead07bade
(cherry picked from commit 97446b8978e0c56d29329e190cadcd964e8bf93d)

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