From b06324a5c1af11b0fef76bdafa569a60498a93d2 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <robdroid@android.com>
Date: Tue, 25 Aug 2009 14:00:10 -0700
Subject: [PATCH] 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
---
 services/java/com/android/server/ConnectivityService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 4e24a4bde52e1..e26dd13032b33 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1111,11 +1111,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                     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 {