LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE

Browse Source 
* commit 'f4c231c4dcadd4633881c23ecea7327deec61c85':
  Fix initialization of RouteInfo
This commit is contained in:
Wink Saville
2011-05-12 14:08:05 -07:00
committed by Android Git Automerger
parent 4df51328bd f4c231c4dc
commit a8f3f7c298
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/net/RouteInfo.java
View File

@@ -47,13 +47,25 @@ public class RouteInfo implements Parcelable {
public RouteInfo(LinkAddress destination, InetAddress gateway) { public RouteInfo(LinkAddress destination, InetAddress gateway) {
if (destination == null) { if (destination == null) {
try { try {
if ((gateway != null) || (gateway instanceof Inet4Address)) { if (gateway != null) {
destination = new LinkAddress(Inet4Address.ANY, 0); if (gateway instanceof Inet4Address) {
destination = new LinkAddress(Inet4Address.ANY, 0);
} else {
destination = new LinkAddress(Inet6Address.ANY, 0);
}
} else { } else {
destination = new LinkAddress(Inet6Address.ANY, 0); // no destination, no gateway. invalid.
throw new RuntimeException("Invalid arguments passed in.");
} }
} catch (Exception e) {} } catch (Exception e) {}
} }
if (gateway == null) {
if (destination.getAddress() instanceof Inet4Address) {
gateway = Inet4Address.ANY;
} else {
gateway = Inet6Address.ANY;
}
}
mDestination = new LinkAddress(NetworkUtils.getNetworkPart(destination.getAddress(), mDestination = new LinkAddress(NetworkUtils.getNetworkPart(destination.getAddress(),
destination.getNetworkPrefixLength()), destination.getNetworkPrefixLength()); destination.getNetworkPrefixLength()), destination.getNetworkPrefixLength());
mGateway = gateway; mGateway = gateway;