commit 72baa8fbb2d117e885022e736e91ec231e809264
author Robert Greenwalt <rgreenwalt@google.com> Mon Feb 11 23:57:39 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 11 23:57:47 2013 +0000
tree f2271538d0e02ebe937516274ce713b63e28f4ed
parent 20949a76fee62e89d7dc22858a74469efa14f61d
parent 0dd19a8394dea139804fea126ce9ba7539a3724d

Merge "Reintroduce the net.dns system properties <TEMP>"

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index fb81391..6efe4c5 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -200,6 +200,7 @@
     private int mDefaultConnectionSequence = 0;
 
     private Object mDnsLock = new Object();
+    private int mNumDnsEntries;
     private boolean mDnsOverridden = false;
 
     private boolean mTestMode;
@@ -2479,6 +2480,17 @@
         try {
             mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses), domains);
             mNetd.setDefaultInterfaceForDns(iface);
+            for (InetAddress dns : dnses) {
+                ++last;
+                String key = "net.dns" + last;
+                String value = dns.getHostAddress();
+                SystemProperties.set(key, value);
+            }
+            for (int i = last + 1; i <= mNumDnsEntries; ++i) {
+                String key = "net.dns" + i;
+                SystemProperties.set(key, "");
+            }
+            mNumDnsEntries = last;
         } catch (Exception e) {
             if (DBG) loge("exception setting default dns interface: " + e);
         }