Merge changes I86257bc8,I5c2221c5 into nyc-dev

* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
This commit is contained in:
Lorenzo Colitti
2016-05-02 12:49:17 +00:00
committed by Android (Google) Code Review

View File

@@ -4317,10 +4317,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
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) {