summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2014-06-12 01:43:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-06-10 22:12:51 +0000
commitf5ccb5cc7d7f2a0339ff3cdb28bf6883b55c8627 (patch)
tree6a413b42d8acb916f7d4743d69030f8941c74a5f
parentb6b79c134e0f5c7ebb88c3f78b8417d95a24a247 (diff)
parent6f0ec45a3bff040790ae84345f154c65c9777610 (diff)
Merge "Fix Build" into lmp-preview-dev
-rw-r--r--core/tests/coretests/src/android/net/RouteInfoTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/net/RouteInfoTest.java b/core/tests/coretests/src/android/net/RouteInfoTest.java
index f67c39d46809..c80d0bfd8d0c 100644
--- a/core/tests/coretests/src/android/net/RouteInfoTest.java
+++ b/core/tests/coretests/src/android/net/RouteInfoTest.java
@@ -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");
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("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")));
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("192.0.2.1")));
assertFalse(ipv4Default.matches(Address("2001:db8::f00")));