[-]
[+]
|
Changed |
_service:tar_git:ofono.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/slava/ofono.git</param>
<param name="branch">master</param>
- <param name="revision">771e8be</param>
+ <param name="revision">d65bbc</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git26.tar.bz2/ofono/drivers/ril/ril_gprs_context.c
^
|
@@ -434,8 +434,6 @@
ofono_gprs_context_cb_t cb;
gpointer cb_data;
- ofono_info("setting up data call");
-
ril_error_init_failure(&error);
if (ril_status != RIL_E_SUCCESS) {
ofono_error("GPRS context: Reply failure: %s",
@@ -456,6 +454,8 @@
goto done;
}
+ ofono_info("setting up data call");
+
/* Check the ip address */
ril_gprs_split_ip_by_protocol(call->addresses, &split_ip_addr,
&split_ipv6_addr);
@@ -636,7 +636,15 @@
DBG("");
ofono_gprs_context_set_data(gc, NULL);
- ril_data_request_cancel(gcd->activate.req);
+ if (gcd->activate.req) {
+ /*
+ * The core has already completed its pending D-Bus
+ * request, invoking the completion callback will
+ * cause libdbus to panic.
+ */
+ ril_data_request_detach(gcd->activate.req);
+ ril_data_request_cancel(gcd->activate.req);
+ }
if (gcd->deactivate.req) {
/* Let it complete but we won't be around to be notified. */
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git26.tar.bz2/ofono/drivers/ril/ril_sms.c
^
|
@@ -1,7 +1,7 @@
/*
* oFono - Open Source Telephony - RIL-based devices
*
- * Copyright (C) 2015 Jolla Ltd.
+ * Copyright (C) 2015-2016 Jolla Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -22,6 +22,9 @@
#include "util.h"
#include "simutil.h"
+#define RIL_SMS_ACK_RETRY_MS 1000
+#define RIL_SMS_ACK_RETRY_COUNT 10
+
#define SIM_EFSMS_FILEID 0x6F3C
#define EFSMS_LENGTH 176
@@ -278,6 +281,8 @@
grilio_request_append_int32(req, code); /* error code */
/* ACK the incoming NEW_SMS */
+ grilio_request_set_retry(req, RIL_SMS_ACK_RETRY_MS,
+ RIL_SMS_ACK_RETRY_COUNT);
grilio_queue_send_request_full(sd->q, req,
RIL_REQUEST_SMS_ACKNOWLEDGE, ril_ack_delivery_cb, NULL, NULL);
grilio_request_unref(req);
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git26.tar.bz2/ofono/plugins/provision.c
^
|
@@ -3,7 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- * Copyright (C) 2013 Jolla Ltd.
+ * Copyright (C) 2013-2016 Jolla Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -86,6 +86,7 @@
/* Picks best ap, deletes the rest. Creates one if necessary */
static GSList *provision_pick_best_ap(GSList *list, const char* spn,
+ const enum ofono_gprs_proto default_proto,
const struct provision_ap_defaults *defaults)
{
/* Sort the list */
@@ -101,6 +102,7 @@
struct ofono_gprs_provision_data *ap =
g_new0(struct ofono_gprs_provision_data, 1);
+ ap->proto = default_proto;
ap->type = defaults->type;
ap->name = g_strdup(defaults->name);
ap->apn = g_strdup(defaults->apn);
@@ -136,8 +138,10 @@
/* Pick the best ap of each type and concatenate them */
return g_slist_concat(
- provision_pick_best_ap(internet_apns, spn, &internet_defaults),
- provision_pick_best_ap(mms_apns, spn, &mms_defaults));
+ provision_pick_best_ap(internet_apns, spn,
+ mbpi_default_internet_proto, &internet_defaults),
+ provision_pick_best_ap(mms_apns, spn,
+ mbpi_default_mms_proto, &mms_defaults));
}
int provision_get_settings(const char *mcc, const char *mnc,
|