commit 329e04abc866ee246d0f53e57bfbdbda6a4800e1
author Robert Greenwalt <rgreenwalt@google.com> Wed Sep 01 16:18:01 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 01 16:18:01 2010 -0700
tree 36822b5059589d7a432c5c48f68b17921759bf24
parent 94daa185b8fae7319c7a8e43980bc9c8171fd5e3
parent e422ad9819f4e79c286fd0d2202db450776f3705

Merge "Fix NPE in toString"

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 6f23805..54ff69f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -105,7 +105,7 @@
     private int mNumDnsEntries;
 
     private boolean mTestMode;
-    private static ConnectivityService sServiceInstance;
+    private static volatile ConnectivityService sServiceInstance;
 
     private Handler mHandler;
 
@@ -121,6 +121,8 @@
     private int mNetTransitionWakeLockSerialNumber;
     private int mNetTransitionWakeLockTimeout;
 
+    private InetAddress mDefaultDns;
+
     private static class NetworkAttributes {
         /**
          * Class for holding settings read from resources.
@@ -174,11 +176,10 @@
             Looper.loop();
         }
 
-        public static ConnectivityService getServiceInstance(Context context) {
-            ConnectivityThread thread = new ConnectivityThread(context);
-            thread.start();
-
-            synchronized (thread) {
+        public static synchronized ConnectivityService getServiceInstance(Context context) {
+            if (sServiceInstance == null) {
+                ConnectivityThread thread = new ConnectivityThread(context);
+                thread.start();
                 while (sServiceInstance == null) {
                     try {
                         // Wait until sServiceInstance has been initialized.
@@ -210,6 +211,19 @@
             SystemProperties.set("net.hostname", name);
         }
 
+        // read our default dns server ip
+        String dns = Settings.Secure.getString(context.getContentResolver(),
+                Settings.Secure.DEFAULT_DNS_SERVER);
+        if (dns == null || dns.length() == 0) {
+            dns = context.getResources().getString(
+                    com.android.internal.R.string.config_default_dns_server);
+        }
+        try {
+            mDefaultDns = InetAddress.getByName(dns);
+        } catch (UnknownHostException e) {
+            Slog.e(TAG, "Error setting defaultDns using " + dns);
+        }
+
         mContext = context;
 
         PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
@@ -1469,12 +1483,20 @@
             Collection<InetAddress> dnses = p.getDnses();
             if (mNetAttributes[netType].isDefault()) {
                 int j = 1;
-                for (InetAddress dns : dnses) {
+                if (dnses.size() == 0 && mDefaultDns != null) {
                     if (DBG) {
-                        Slog.d(TAG, "adding dns " + dns + " for " +
-                                nt.getNetworkInfo().getTypeName());
+                        Slog.d(TAG, "no dns provided - using " + mDefaultDns.getHostAddress());
                     }
-                    SystemProperties.set("net.dns" + j++, dns.getHostAddress());
+                    SystemProperties.set("net.dns1", mDefaultDns.getHostAddress());
+                    j++;
+                } else {
+                    for (InetAddress dns : dnses) {
+                        if (DBG) {
+                            Slog.d(TAG, "adding dns " + dns + " for " +
+                                    nt.getNetworkInfo().getTypeName());
+                        }
+                        SystemProperties.set("net.dns" + j++, dns.getHostAddress());
+                    }
                 }
                 for (int k=j ; k<mNumDnsEntries; k++) {
                     if (DBG) Slog.d(TAG, "erasing net.dns" + k);