commit 4d5ecf6bb206bca2aa503dcc781633428d40db3a
author Robert Greenwalt <rgreenwalt@google.com> Tue Jul 26 15:26:02 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Tue Jul 26 15:26:02 2011 -0700
tree a18a695293518b9b62734d5a47475d6e3838c829
parent b6ce2c7b76b383bbfff8cef9fe93080c913edaf1
parent 9520d6af5a2a00333af0244b6cbe3a9e27513bb6

resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp

Change-Id: If4dc99c558dc45c9a7ff8d3ea5be69578b4ee793

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 0843948..8a21f4f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1985,6 +1985,12 @@
             LinkProperties p = nt.getLinkProperties();
             if (p == null) return;
             Collection<InetAddress> dnses = p.getDnses();
+            try {
+                mNetd.setDnsServersForInterface(p.getInterfaceName(),
+                        NetworkUtils.makeStrings(dnses));
+            } catch (Exception e) {
+                Slog.e(TAG, "exception setting dns servers: " + e);
+            }
             boolean changed = false;
             if (mNetConfigs[netType].isDefault()) {
                 String network = nt.getNetworkInfo().getTypeName();