Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22638 into eclair

Browse Source 
* changes:
  Fix the removal of dns entries.
This commit is contained in:
Android (Google) Code Review
2009-08-25 16:11:47 -07:00
parent ca5362cec4 b06324a5c1
commit 8d61d00583
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1111,11 +1111,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int j = 1; int j = 1;
for (String dns : dnsList) { for (String dns : dnsList) {
if (dns != null && !TextUtils.equals(dns, "0.0.0.0")) { if (dns != null && !TextUtils.equals(dns, "0.0.0.0")) {
if (DBG) Log.d(TAG, " adding "+dns);
SystemProperties.set("net.dns" + j++, dns); SystemProperties.set("net.dns" + j++, dns);
} }
} }
for (int k=j ; k<mNumDnsEntries; k++) { for (int k=j ; k<mNumDnsEntries; k++) {
SystemProperties.set("net.dns" + j, ""); if (DBG) Log.d(TAG, "erasing net.dns" + k);
SystemProperties.set("net.dns" + k, "");
} }
mNumDnsEntries = j; mNumDnsEntries = j;
} else { } else {