commit 69afd73f8785bde00fc428431b72b9c2f97031ff
author Elliott Hughes <enh@google.com> Thu Nov 04 15:43:30 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 04 15:43:30 2010 -0700
tree a221aa651828023c563723a564a801051efeb599
parent 0a115aae82ea96bd9079bbb024e99330ea99df0a
parent a9a2481dfde0226aa9ad6a153cfda4d8e502e35b

Merge "Use InetAddress.isNumeric."

src/com/android/settings/wifi/WifiConfigController.java

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index d1700a6..a97c6ce 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -375,7 +375,7 @@
     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 @@
             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));