commit c59c6da9ae14097c77eee69285c6eacc8130936c
author Robert Greenwalt <rgreenwalt@google.com> Wed Jul 27 10:00:36 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Wed Jul 27 10:00:36 2011 -0700
tree 14a8c34506438ebccbfa9fee4b74af45fb7d2181
parent 804b3d76c39eca09cbbd8b7c3fa1718e7ad094cc
parent af75fdb16566c3011284afaa7d12bcf6126dd4f3

resolved conflicts for merge of af75fdb1 to master

Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129

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 8a21f4f..9a9cc8f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1985,12 +1985,6 @@
             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();
@@ -2001,7 +1995,7 @@
                 }
             } else {
                 try {
-                    mNetd.setDnsServersForInterface(Integer.toString(netType),
+                    mNetd.setDnsServersForInterface(p.getInterfaceName(),
                             NetworkUtils.makeStrings(dnses));
                 } catch (Exception e) {
                     Slog.e(TAG, "exception setting dns servers: " + e);