commit 9f1c3f099f410fd1e3b65f1216012c10f01c10fb
author Erik Kline <ek@google.com> Fri Nov 13 11:54:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 13 11:54:04 2015 +0000
tree b8620443109cbaa1347dd8472e5d6e96c15fb0e4
parent 46dd449420c52a8bb30f5bfe839c6043392381a1
parent 748a509fb138b25d77915e977aa6a4e40bf9e864

Merge "Pass both IPv4 and IPv6 DNS servers as tethering DNS forwarders"

services/core/java/com/android/server/connectivity/Tethering.java

diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index c1aaf07..6687412 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -1353,18 +1353,9 @@
                     if (iface != null) {
                         String[] dnsServers = mDefaultDnsServers;
                         Collection<InetAddress> dnses = linkProperties.getDnsServers();
-                        if (dnses != null) {
-                            // we currently only handle IPv4
-                            ArrayList<InetAddress> v4Dnses =
-                                    new ArrayList<InetAddress>(dnses.size());
-                            for (InetAddress dnsAddress : dnses) {
-                                if (dnsAddress instanceof Inet4Address) {
-                                    v4Dnses.add(dnsAddress);
-                                }
-                            }
-                            if (v4Dnses.size() > 0) {
-                                dnsServers = NetworkUtils.makeStrings(v4Dnses);
-                            }
+                        if (dnses != null && !dnses.isEmpty()) {
+                            // TODO: remove this invocation of NetworkUtils.makeStrings().
+                            dnsServers = NetworkUtils.makeStrings(dnses);
                         }
                         try {
                             Network network = getConnectivityManager().getNetworkForType(upType);