resolved conflicts for merge of af75fdb1 to master

Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129

1 files changed, 1 insertions, 7 deletions

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 8a21f4f80ba0..9a9cc8ffba27 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1985,12 +1985,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
             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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                 }
             } 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);