commit 0efe4aa812e0f99cf512ca8772b7f2b84f2a9d66
author Robert Greenwalt <rgreenwalt@google.com> Thu Mar 03 08:32:53 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 08:32:53 2011 -0800
tree af6d867619e92bb04eaa78f11545d5ffa1a5b7ed
parent 95c300a353dd6916e65d84bac7c23a13b8e0ec08
parent 0ce55042b4445316337d31c770fc4c5562493544

Merge "Add some input checking to prevent problems"

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index c061a83..b7d0a8f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -286,8 +286,8 @@
                     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);
         }