From 97446b8978e0c56d29329e190cadcd964e8bf93d Mon Sep 17 00:00:00 2001
From: Pavel Maltsev <pavelm@google.com>
Date: Sat, 28 Apr 2018 23:23:26 -0700
Subject: [PATCH] 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
Change-Id: I3405dd4f72d4a6444448f0d6ec0497aead07bade
---
 .../android/server/ethernet/EthernetNetworkFactory.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index f95500e6e8..de0a691c75 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 @@ public class EthernetNetworkFactory extends NetworkFactory {
             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();