Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev

Browse Source
This commit is contained in:
Erik Kline
2016-04-22 03:14:04 +00:00
committed by Android (Google) Code Review
parent 42a6dc9bd6 c2827857aa
commit 5486aabc74
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -264,8 +264,8 @@ public class DhcpClient extends StateMachine {
mInterfaceBroadcastAddr = new PacketSocketAddress(mIface.getIndex(), mInterfaceBroadcastAddr = new PacketSocketAddress(mIface.getIndex(),
DhcpPacket.ETHER_BROADCAST); DhcpPacket.ETHER_BROADCAST);
return true; return true;
} catch(SocketException e) { } catch(SocketException | NullPointerException e) {
Log.wtf(TAG, "Can't determine ifindex or MAC address for " + mIfaceName); Log.e(TAG, "Can't determine ifindex or MAC address for " + mIfaceName, e);
return false; return false;
} }
} }

2
services/net/java/android/net/ip/IpManager.java
View File

@@ -690,7 +690,7 @@ public class IpManager extends StateMachine {
final InterfaceConfiguration ifcg = new InterfaceConfiguration(); final InterfaceConfiguration ifcg = new InterfaceConfiguration();
ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0")); ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0"));
mNwService.setInterfaceConfig(mInterfaceName, ifcg); mNwService.setInterfaceConfig(mInterfaceName, ifcg);
} catch (RemoteException e) { } catch (IllegalStateException | RemoteException e) {
Log.e(mTag, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e); Log.e(mTag, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e);
} }
} }