commit | ea0c03ee6364c4184afce5eeaf081c322bb24ffc | [log] [tgz] |
---|---|---|
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 | 328cb454e6d61f607f68d3eab2ff610f0e0ce74e | |
parent | 4ae39913b6a2ef27a14b5bb318b15fe80f140c6e [diff] | |
parent | 813d57c51c82cc7a3a1f51c6e2427f623f3a8689 [diff] |
Fix NPE during dumpsys ethernet am: 813d57c51c Change-Id: Iaba04ea0a6ffc07a289b93cc3bf2192fcf9fb1c2
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index f95500e..de0a691 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/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();