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 
am: 5486aabc74

* commit '5486aabc747501da868985a9df5e4d24d2395fda':
  IpManager,DhcpClient: catch some errors and better logging

Change-Id: Idc9d3d0aefbd7dedaa31a2f21b06ca80f4383c30
This commit is contained in:
Erik Kline
2016-04-22 03:21:47 +00:00
committed by android-build-merger
parent 1a9fafce2e 5486aabc74
commit f152a8ed35
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(),
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;
}
}

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();
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);
}
}