From 35e34d1276a746434450ed38e7c0531d002e2a1b Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Tue, 22 Feb 2011 16:00:42 -0800 Subject: [PATCH] Start using NetworkUtils.numericToInetAddress. Generates InetAddresses without risking an accidental dns lookup. For use with supposedly numeric-only ip address strings. Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a --- services/java/com/android/server/ConnectivityService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 8e39a63fe3..b49f216b9f 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); }