diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-02 12:10:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 12:10:51 -0800 |
| commit | 7e48e76cab10377367b925790cf3a840651009fa (patch) | |
| tree | 74833222c8eeb9fd4c53711b61999d30761de74a /services/java/com/android/server/ConnectivityService.java | |
| parent | 76bb1200c2ea08665f33fb0d54023113c19b8286 (diff) | |
| parent | e590373ea71251cfffc8f22f011e2e6335dce716 (diff) | |
Merge "Start using NetworkUtils.numericToInetAddress."
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index c061a8399356..b7d0a8f9b584 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -286,8 +286,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { com.android.internal.R.string.config_default_dns_server); } try { - mDefaultDns = InetAddress.getByName(dns); - } catch (UnknownHostException e) { + mDefaultDns = NetworkUtils.numericToInetAddress(dns); + } catch (IllegalArgumentException e) { loge("Error setting defaultDns using " + dns); } |