diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-11-23 11:25:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-23 11:25:39 -0800 |
| commit | eaeb4f4e3c914550d28a042fb3d752efcf20ab9e (patch) | |
| tree | 24b933974484d6fe2e1b755ef7fd7e43ac44b7c1 /telephony | |
| parent | 8bb56180d208b9264e5a56b49fe06b8471ccaced (diff) | |
| parent | e83d181606981bcacd78e55b293fe9fa95b2551d (diff) | |
| download | frameworks_base-eaeb4f4e3c914550d28a042fb3d752efcf20ab9e.zip frameworks_base-eaeb4f4e3c914550d28a042fb3d752efcf20ab9e.tar.gz frameworks_base-eaeb4f4e3c914550d28a042fb3d752efcf20ab9e.tar.bz2 | |
Merge "Fix some policy-base routing issues." into ics-mr1
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataCallState.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataCallState.java b/telephony/java/com/android/internal/telephony/DataCallState.java index 6d8956f..efbf608 100644 --- a/telephony/java/com/android/internal/telephony/DataCallState.java +++ b/telephony/java/com/android/internal/telephony/DataCallState.java @@ -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); |