summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-01-23 06:10:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-23 06:10:48 +0000
commite871f0176d035fe28665972097c14d899fd0b47a (patch)
treea0bce9a0035e28503b10585dac1e6d1fd0884d12 /core
parentf0ab37c2b980c496594f496e7b5e12f543485670 (diff)
parent6840ffae6761b369992fceb6b880cd9cd600b136 (diff)
downloadframeworks_base-e871f0176d035fe28665972097c14d899fd0b47a.zip
frameworks_base-e871f0176d035fe28665972097c14d899fd0b47a.tar.gz
frameworks_base-e871f0176d035fe28665972097c14d899fd0b47a.tar.bz2
am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
automerge: 6840ffa * commit '6840ffae6761b369992fceb6b880cd9cd600b136': Use the proper IpPrefix and LinkAddress constructors in VPN code.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/net/VpnService.java2
-rw-r--r--core/java/com/android/internal/net/VpnConfig.java9
2 files changed, 4 insertions, 7 deletions
diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java
index f6b6978..c26af06 100644
--- a/core/java/android/net/VpnService.java
+++ b/core/java/android/net/VpnService.java
@@ -501,7 +501,7 @@ public class VpnService extends Service {
}
}
}
- mRoutes.add(new RouteInfo(new LinkAddress(address, prefixLength), null));
+ mRoutes.add(new RouteInfo(new IpPrefix(address, prefixLength), null));
mConfig.updateAllowedFamilies(address);
return this;
}
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java
index c5d9db4..921f1fe 100644
--- a/core/java/com/android/internal/net/VpnConfig.java
+++ b/core/java/com/android/internal/net/VpnConfig.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
+import android.net.IpPrefix;
import android.net.LinkAddress;
import android.net.Network;
import android.net.RouteInfo;
@@ -117,9 +118,7 @@ public class VpnConfig implements Parcelable {
String[] routes = routesStr.trim().split(" ");
for (String route : routes) {
//each route is ip/prefix
- String[] split = route.split("/");
- RouteInfo info = new RouteInfo(new LinkAddress
- (InetAddress.parseNumericAddress(split[0]), Integer.parseInt(split[1])), null);
+ RouteInfo info = new RouteInfo(new IpPrefix(route), null);
this.routes.add(info);
updateAllowedFamilies(info.getDestination().getAddress());
}
@@ -132,9 +131,7 @@ public class VpnConfig implements Parcelable {
String[] addresses = addressesStr.trim().split(" ");
for (String address : addresses) {
//each address is ip/prefix
- String[] split = address.split("/");
- LinkAddress addr = new LinkAddress(InetAddress.parseNumericAddress(split[0]),
- Integer.parseInt(split[1]));
+ LinkAddress addr = new LinkAddress(address);
this.addresses.add(addr);
updateAllowedFamilies(addr.getAddress());
}