am 55ccb887: Merge "Don\'t check for services before boot-complete" into honeycomb

* commit '55ccb8877549c539daa9b78d370452680045a77b':
  Don't check for services before boot-complete

core/java/android/content/SyncManager.java

@@ -1375,10 +1375,10 @@ public class SyncManager implements OnAccountsUpdateListener {
             long nextPendingSyncTime = Long.MAX_VALUE;
             // Setting the value here instead of a method because we want the dumpsys logs
             // to have the most recent value used.
-            mDataConnectionIsConnected =
-                    getConnectivityManager().getActiveNetworkInfo().isConnected();
             try {
                 waitUntilReadyToRun();
+                NetworkInfo info = getConnectivityManager().getActiveNetworkInfo();
+                mDataConnectionIsConnected = (info != null) && info.isConnected();
                 mSyncManagerWakeLock.acquire();
                 // Always do this first so that we be sure that any periodic syncs that
                 // are ready to run have been converted into pending syncs. This allows the