joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Unit test routes with interfaces in LinkProperties

Browse source 
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af
This commit is contained in:
Lorenzo Colitti 2013-03-08 19:11:40 -08:00
commit 8ec0b8a5d6
1 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/java/android/net/LinkProperties.java
View file

@ -146,9 +146,9 @@ public class LinkProperties implements Parcelable {
if (route != null) {
String routeIface = route.getInterface();
if (routeIface != null && !routeIface.equals(mIfaceName)) {
throw new IllegalStateException(
throw new IllegalArgumentException(
"Route added with non-matching interface: " + routeIface +
" vs. mIfaceName");
" vs. " + mIfaceName);
}
mRoutes.add(routeWithInterface(route));
}
@ -370,7 +370,7 @@ public class LinkProperties implements Parcelable {
public CompareResult<RouteInfo> compareRoutes(LinkProperties target) {
/*
* Duplicate the RouteInfos into removed, we will be removing
* routes which are common between mDnses and target
* routes which are common between mRoutes and target
* leaving the routes that are different. And route address which
* are in target but not in mRoutes are placed in added.
*/