commit a10b7fd2239668a87be690a57ef7b3bc39b6bfd3
author Robert Greenwalt <rgreenwalt@google.com> Mon Jul 25 16:06:25 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon Jul 25 16:06:25 2011 -0700
tree 9495a476c1f8536d4df81643c9c7612c9b1d2cba
parent b243d5bc7db88396f0da304553687e7a0bccfa3d
parent a7f68230be1ac025dbeada77e2ff3f16bb2ac04c

resolved conflicts for merge of a7f68230 to master

Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9

core/java/android/net/NetworkUtils.java

diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index 76534ef..e289fc1 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -20,6 +20,7 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.UnknownHostException;
+import java.util.Collection;
 
 import android.util.Log;
 
@@ -235,4 +236,18 @@
             throw new IllegalArgumentException(e);
         }
     }
+
+    /**
+     * Create a string array of host addresses from a collection of InetAddresses
+     * @param addrs a Collection of InetAddresses
+     * @return an array of Strings containing their host addresses
+     */
+    public static String[] makeStrings(Collection<InetAddress> addrs) {
+        String[] result = new String[addrs.size()];
+        int i = 0;
+        for (InetAddress addr : addrs) {
+            result[i++] = addr.getHostAddress();
+        }
+        return result;
+    }
 }