From a9a2481dfde0226aa9ad6a153cfda4d8e502e35b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 4 Nov 2010 15:26:22 -0700 Subject: [PATCH] Use InetAddress.isNumeric. Bug: 3073384 Change-Id: I22b03efd7fe267f8b20c06cfc15aa5f0db487ca8 --- src/com/android/settings/wifi/WifiConfigController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index d1700a69a34..a97c6ce064d 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -375,7 +375,7 @@ public class WifiConfigController implements TextWatcher, private int validateIpConfigFields(LinkProperties linkProperties) { try { String ipAddr = mIpAddressView.getText().toString(); - if (!NetworkUtils.isIpAddress(ipAddr)) { + if (!InetAddress.isNumeric(ipAddr)) { return R.string.wifi_ip_settings_invalid_ip_address; } InetAddress inetAddr = InetAddress.getByName(ipAddr); @@ -389,19 +389,19 @@ public class WifiConfigController implements TextWatcher, linkProperties.addLinkAddress(new LinkAddress(inetAddr, networkPrefixLength)); String gateway = mGatewayView.getText().toString(); - if (!NetworkUtils.isIpAddress(gateway)) { + if (!InetAddress.isNumeric(gateway)) { return R.string.wifi_ip_settings_invalid_gateway; } linkProperties.setGateway(InetAddress.getByName(gateway)); String dns = mDns1View.getText().toString(); - if (!NetworkUtils.isIpAddress(dns)) { + if (!InetAddress.isNumeric(dns)) { return R.string.wifi_ip_settings_invalid_dns; } linkProperties.addDns(InetAddress.getByName(dns)); if (mDns2View.length() > 0) { dns = mDns2View.getText().toString(); - if (!NetworkUtils.isIpAddress(dns)) { + if (!InetAddress.isNumeric(dns)) { return R.string.wifi_ip_settings_invalid_dns; } linkProperties.addDns(InetAddress.getByName(dns));