[-]
[+]
|
Changed |
_service:tar_git:ofono.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -1,7 +1,7 @@
<services>
<service name="tar_git">
<param name="url">https://git.merproject.org/slava/ofono.git</param>
- <param name="branch">data_calls</param>
- <param name="revision">f8351ca</param>
+ <param name="branch">master</param>
+ <param name="revision">c5286fee</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.18+git3.tar.bz2/ofono/drivers/ril/ril_data.c
^
|
@@ -173,7 +173,6 @@
gulong handler_id;
};
-static gboolean ril_data_manager_handover(struct ril_data_manager *dm);
static void ril_data_manager_check_data(struct ril_data_manager *dm);
static void ril_data_manager_check_network_mode(struct ril_data_manager *dm);
@@ -1090,6 +1089,7 @@
grilio_request_unref(req);
dm->data_list = g_slist_append(dm->data_list, self);
+ ril_data_manager_check_network_mode(dm);
return self;
}
return NULL;
@@ -1392,6 +1392,16 @@
}
}
+static gboolean ril_data_manager_handover(struct ril_data_manager *self)
+{
+ /*
+ * The 3G/LTE handover thing only makes sense if we are managing
+ * more than one SIM slot. Otherwise leave things where they are.
+ */
+ return (self->data_list && self->data_list->next &&
+ (self->flags & RIL_DATA_MANAGER_3GLTE_HANDOVER));
+}
+
static gboolean ril_data_manager_requests_pending(struct ril_data_manager *self)
{
GSList *l;
@@ -1475,16 +1485,6 @@
return NULL;
}
-static gboolean ril_data_manager_handover(struct ril_data_manager *self)
-{
- /*
- * The 3G/LTE handover thing only makes sense if we are managing
- * more than one SIM slot. Otherwise leave things where they are.
- */
- return (self->data_list && self->data_list->next &&
- (self->flags & RIL_DATA_MANAGER_3GLTE_HANDOVER));
-}
-
static void ril_data_manager_switch_data_on(struct ril_data_manager *self,
struct ril_data *data)
{
|