Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some policy-base routing issues." into ics-mr1

Browse Source
This commit is contained in:
Robert Greenwalt
2011-11-23 11:25:39 -08:00
committed by Android (Google) Code Review
parent 8bb56180d2 e83d181606
commit eaeb4f4e3c
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/DataCallState.java
View File

@@ -126,6 +126,8 @@ public class DataCallState {
// set link addresses
if (addresses != null && addresses.length > 0) {
for (String addr : addresses) {
addr = addr.trim();
if (addr.isEmpty()) continue;
LinkAddress la;
int addrPrefixLen;
@@ -159,6 +161,8 @@ public class DataCallState {
// set dns servers
if (dnses != null && dnses.length > 0) {
for (String addr : dnses) {
addr = addr.trim();
if (addr.isEmpty()) continue;
InetAddress ia;
try {
ia = NetworkUtils.numericToInetAddress(addr);
@@ -174,6 +178,8 @@ public class DataCallState {
dnsServers[0] = SystemProperties.get(propertyPrefix + "dns1");
dnsServers[1] = SystemProperties.get(propertyPrefix + "dns2");
for (String dnsAddr : dnsServers) {
dnsAddr = dnsAddr.trim();
if (dnsAddr.isEmpty()) continue;
InetAddress ia;
try {
ia = NetworkUtils.numericToInetAddress(dnsAddr);
@@ -198,6 +204,8 @@ public class DataCallState {
}
}
for (String addr : gateways) {
addr = addr.trim();
if (addr.isEmpty()) continue;
InetAddress ia;
try {
ia = NetworkUtils.numericToInetAddress(addr);