LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 20f253eb7d

Browse Source 
am: ddb5e9164d

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

Change-Id: I36c07f09ac62620fd4119eff1f9da5a278d08144
This commit is contained in:
Lorenzo Colitti
2016-05-02 13:04:22 +00:00
committed by android-build-merger
parent e041484836 ddb5e9164d
commit e5243a3a5a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4317,10 +4317,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
Collection<InetAddress> dnses = newLp.getDnsServers(); Collection<InetAddress> dnses = newLp.getDnsServers();
if (DBG) log("Setting DNS servers for network " + netId + " to " + dnses); if (DBG) log("Setting DNS servers for network " + netId + " to " + dnses);
try { try {
mNetd.setDnsServersForNetwork( mNetd.setDnsConfigurationForNetwork(
netId, NetworkUtils.makeStrings(dnses), newLp.getDomains()); netId, NetworkUtils.makeStrings(dnses), newLp.getDomains());
} catch (Exception e) { } catch (Exception e) {
loge("Exception in setDnsServersForNetwork: " + e); loge("Exception in setDnsConfigurationForNetwork: " + e);
} }
final NetworkAgentInfo defaultNai = getDefaultNetwork(); final NetworkAgentInfo defaultNai = getDefaultNetwork();
if (defaultNai != null && defaultNai.network.netId == netId) { if (defaultNai != null && defaultNai.network.netId == netId) {