Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d61d005 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22638 into eclair 

* changes:
  Fix the removal of dns entries.
parents ca5362ce b06324a5

services/java/com/android/server/ConnectivityService.java

+3 −1
Original line number Diff line number Diff line
@@ -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 {