commit 20f253eb7d82f980d1c6cbab2b06315a027ed62c
author Lorenzo Colitti <lorenzo@google.com> Mon May 02 12:49:17 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 12:49:19 2016 +0000
tree fc93b36b99f16c24f7985a6abb38ab37cb801c12
parent 7dbf83df03da96f02157ab0d2d1377c1cdc1d8c7
parent 2166469c851e899d91dfd7892f2b85770fe2a4db

Merge changes I86257bc8,I5c2221c5 into nyc-dev

* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index f5e9d19..00dcdea 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4317,10 +4317,10 @@
         Collection<InetAddress> dnses = newLp.getDnsServers();
         if (DBG) log("Setting DNS servers for network " + netId + " to " + dnses);
         try {
-            mNetd.setDnsServersForNetwork(
+            mNetd.setDnsConfigurationForNetwork(
                     netId, NetworkUtils.makeStrings(dnses), newLp.getDomains());
         } catch (Exception e) {
-            loge("Exception in setDnsServersForNetwork: " + e);
+            loge("Exception in setDnsConfigurationForNetwork: " + e);
         }
         final NetworkAgentInfo defaultNai = getDefaultNetwork();
         if (defaultNai != null && defaultNai.network.netId == netId) {