am f7c964fa: Merge "Fix Build" into lmp-preview-dev

* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build
This commit is contained in:
Robert Greenwalt
2014-06-12 19:57:23 +00:00
committed by Android Git Automerger

View File

@@ -83,7 +83,7 @@ public class RouteInfoTest extends TestCase {
} }
} }
RouteInfo r; PatchedRouteInfo r;
r = new PatchedRouteInfo(Prefix("2001:db8:f00::ace:d00d/127"), null, "rmnet0"); r = new PatchedRouteInfo(Prefix("2001:db8:f00::ace:d00d/127"), null, "rmnet0");
assertTrue(r.matches(Address("2001:db8:f00::ace:d00c"))); assertTrue(r.matches(Address("2001:db8:f00::ace:d00c")));
@@ -98,11 +98,11 @@ public class RouteInfoTest extends TestCase {
assertFalse(r.matches(Address("192.0.0.21"))); assertFalse(r.matches(Address("192.0.0.21")));
assertFalse(r.matches(Address("8.8.8.8"))); assertFalse(r.matches(Address("8.8.8.8")));
RouteInfo ipv6Default = new PatchedRouteInfo(Prefix("::/0"), null, "rmnet0"); PatchedRouteInfo ipv6Default = new PatchedRouteInfo(Prefix("::/0"), null, "rmnet0");
assertTrue(ipv6Default.matches(Address("2001:db8::f00"))); assertTrue(ipv6Default.matches(Address("2001:db8::f00")));
assertFalse(ipv6Default.matches(Address("192.0.2.1"))); assertFalse(ipv6Default.matches(Address("192.0.2.1")));
RouteInfo ipv4Default = new PatchedRouteInfo(Prefix("0.0.0.0/0"), null, "rmnet0"); PatchedRouteInfo ipv4Default = new PatchedRouteInfo(Prefix("0.0.0.0/0"), null, "rmnet0");
assertTrue(ipv4Default.matches(Address("255.255.255.255"))); assertTrue(ipv4Default.matches(Address("255.255.255.255")));
assertTrue(ipv4Default.matches(Address("192.0.2.1"))); assertTrue(ipv4Default.matches(Address("192.0.2.1")));
assertFalse(ipv4Default.matches(Address("2001:db8::f00"))); assertFalse(ipv4Default.matches(Address("2001:db8::f00")));