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

resolved conflicts for merge of aaf31586 to master

Browse Source 
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
This commit is contained in:
Robert Greenwalt
2011-07-25 16:06:25 -07:00
parent 865fcf3eb3 aaf31586ce
commit fce7186be1
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/java/com/android/server/ConnectivityService.java
View File

@@ -1926,7 +1926,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
// Caller must grab mDnsLock.
private boolean updateDns(String network, Collection<InetAddress> dnses, String domains) {
private boolean updateDns(String network, String iface,
Collection<InetAddress> dnses, String domains) {
boolean changed = false;
int last = 0;
if (dnses.size() == 0 && mDefaultDns != null) {
@@ -1962,6 +1963,14 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
mNumDnsEntries = last;
if (changed) {
try {
mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses));
mNetd.setDefaultInterfaceForDns(iface);
} catch (Exception e) {
Slog.e(TAG, "exception setting default dns interface: " + e);
}
}
if (!domains.equals(SystemProperties.get("net.dns.search"))) {
SystemProperties.set("net.dns.search", domains);
changed = true;
@@ -1981,10 +1990,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
String network = nt.getNetworkInfo().getTypeName();
synchronized (mDnsLock) {
if (!mDnsOverridden) {
changed = updateDns(network, dnses, "");
changed = updateDns(network, p.getInterfaceName(), dnses, "");
}
}
} else {
try {
mNetd.setDnsServersForInterface(Integer.toString(netType),
NetworkUtils.makeStrings(dnses));
} catch (Exception e) {
Slog.e(TAG, "exception setting dns servers: " + e);
}
// set per-pid dns for attached secondary nets
List pids = mNetRequestersPids[netType];
for (int y=0; y< pids.size(); y++) {
@@ -2686,7 +2701,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// Apply DNS changes.
boolean changed = false;
synchronized (mDnsLock) {
changed = updateDns("VPN", addresses, domains);
changed = updateDns("VPN", "VPN", addresses, domains);
mDnsOverridden = true;
}
if (changed) {