Fix the removal of dns entries.
When switching default networks we should erase any excess dns server entries. The old code
used the wrong index and didn't erase all of them properly.
Found in conjunction with
bug: 2077628
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 4e24a4b..e26dd13 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1111,11 +1111,13 @@
int j = 1;
for (String dns : dnsList) {
if (dns != null && !TextUtils.equals(dns, "0.0.0.0")) {
+ if (DBG) Log.d(TAG, " adding "+dns);
SystemProperties.set("net.dns" + j++, dns);
}
}
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;
} else {
