diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 54ff69f..c28a373 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 volatile ConnectivityService sServiceInstance;
+    private static ConnectivityService sServiceInstance;
 
     private Handler mHandler;
 
@@ -176,10 +176,11 @@
             Looper.loop();
         }
 
-        public static synchronized ConnectivityService getServiceInstance(Context context) {
-            if (sServiceInstance == null) {
-                ConnectivityThread thread = new ConnectivityThread(context);
-                thread.start();
+        public static ConnectivityService getServiceInstance(Context context) {
+            ConnectivityThread thread = new ConnectivityThread(context);
+            thread.start();
+
+            synchronized (thread) {
                 while (sServiceInstance == null) {
                     try {
                         // Wait until sServiceInstance has been initialized.