Merge "Use InetAddress.parseNumericAddress."

core/java/android/net/NetworkUtils.java

@@ -159,17 +159,7 @@ public class NetworkUtils {
      */
     public static InetAddress numericToInetAddress(String addrString)
             throws IllegalArgumentException {
-        // TODO - do this for real, using a hidden method on InetAddress that aborts
-        // instead of doing dns step
-        if (!InetAddress.isNumeric(addrString)) {
-            throw new IllegalArgumentException("numericToInetAddress with non numeric: '" +
-                    addrString + "'");
-        }
-        try {
-            return InetAddress.getByName(addrString);
-        } catch (UnknownHostException e) {
-            throw new IllegalArgumentException(e);
-        }
+        return InetAddress.parseNumericAddress(addrString);
     }
 
     /**