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:
committed by
Android (Google) Code Review
commit
20f253eb7d
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user