From c2827857aa99504903d65e9a750fb61f756101de Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Mon, 18 Apr 2016 12:07:43 +0900 Subject: [PATCH] IpManager,DhcpClient: catch some errors and better logging Bug: 28196843 Change-Id: Ia91e926da569bf9c503ea00e1e0f767d196547da --- services/net/java/android/net/dhcp/DhcpClient.java | 4 ++-- services/net/java/android/net/ip/IpManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java index 52701d532e1ab..6d0808f781fec 100644 --- a/services/net/java/android/net/dhcp/DhcpClient.java +++ b/services/net/java/android/net/dhcp/DhcpClient.java @@ -264,8 +264,8 @@ public class DhcpClient extends StateMachine { mInterfaceBroadcastAddr = new PacketSocketAddress(mIface.getIndex(), DhcpPacket.ETHER_BROADCAST); return true; - } catch(SocketException e) { - Log.wtf(TAG, "Can't determine ifindex or MAC address for " + mIfaceName); + } catch(SocketException | NullPointerException e) { + Log.e(TAG, "Can't determine ifindex or MAC address for " + mIfaceName, e); return false; } } diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java index 59ebf1bc79cc8..5667e340122e5 100644 --- a/services/net/java/android/net/ip/IpManager.java +++ b/services/net/java/android/net/ip/IpManager.java @@ -690,7 +690,7 @@ public class IpManager extends StateMachine { final InterfaceConfiguration ifcg = new InterfaceConfiguration(); ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0")); mNwService.setInterfaceConfig(mInterfaceName, ifcg); - } catch (RemoteException e) { + } catch (IllegalStateException | RemoteException e) { Log.e(mTag, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e); } }