diff options
| author | Pavel Maltsev <pavelm@google.com> | 2018-04-28 23:23:26 -0700 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2018-05-08 16:48:32 +0900 |
| commit | 813d57c51c82cc7a3a1f51c6e2427f623f3a8689 (patch) | |
| tree | 328cb454e6d61f607f68d3eab2ff610f0e0ce74e | |
| parent | 36fd22bb9615a313c68c4f74427e7f8f357934b9 (diff) | |
| download | ethernet-813d57c51c82cc7a3a1f51c6e2427f623f3a8689.tar.gz | |
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 2c002de63839a7ce1ed334af2c75176c00e1e248)
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ 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(); |