[PATCH 2/4] voicecall: api for set/clear alpha and icon id

--- src/ofono.h | 6 ++++ src/voicecall.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/src/ofono.h b/src/ofono.h index 6524806..808a8f1 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -266,6 +266,12 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc, ofono_voicecall_dial_cb_t cb, void *user_data); void __ofono_voicecall_dial_cancel(struct ofono_voicecall *vc); +void __ofono_voicecall_set_alpha_and_icon_id(struct ofono_voicecall *vc, + const char *addr, int addr_type, + const char *message, + unsigned char icon_id); +void __ofono_voicecall_clear_alpha_and_icon_id(struct ofono_voicecall *vc); + int __ofono_voicecall_tone_send(struct ofono_voicecall *vc, const char *tone_str, ofono_voicecall_tone_cb_t cb, void *user_data); diff --git a/src/voicecall.c b/src/voicecall.c index 3646951..33041a1 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -2204,6 +2204,25 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc, goto error; } + if (vc->dial_req) { + v->message = vc->dial_req->message; + v->icon_id = vc->dial_req->icon_id; + + vc->dial_req->message = NULL; + vc->dial_req->call = v; + + newcall->phone_number.type = vc->dial_req->ph.type; + strncpy(newcall->phone_number.number, vc->dial_req->ph.number, + 20); + + /* + * TS 102 223 Section 6.4.13: The terminal shall not store + * in the UICC the call set-up details (called party number + * and associated parameters) + */ + v->untracked = TRUE; + } + v->detect_time = time(NULL); if (!voicecall_dbus_register(v)) { @@ -3659,6 +3678,63 @@ void __ofono_voicecall_tone_cancel(struct ofono_voicecall *vc, int id) } } +void __ofono_voicecall_set_alpha_and_icon_id(struct ofono_voicecall *vc, + const char *addr, int addr_type, + const char *message, + unsigned char icon_id) +{ + struct dial_request *req; + const char *number; + + req = g_new0(struct dial_request, 1); + + req->message = g_strdup(message); + req->icon_id = icon_id; + + req->ph.type = addr_type; + strncpy(req->ph.number, addr, 20); + + number = phone_number_to_string(&req->ph); + + if (!strcmp(number, "112")) { + struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom); + + __ofono_modem_inc_emergency_mode(modem); + } + + vc->dial_req = req; +} + +void __ofono_voicecall_clear_alpha_and_icon_id(struct ofono_voicecall *vc) +{ + const char *number; + + if (vc->dial_req == NULL) + return; + + number = phone_number_to_string(&vc->dial_req->ph); + + /* + * Incase the modem fails to setup the call and if there is no call + * created, then the emergency mode has to be cleared. + */ + if (!strcmp(number, "112")) { + if (voicecalls_num_active(vc) == 0 && + voicecalls_num_connecting(vc) == 0) { + struct ofono_modem *modem = + __ofono_atom_get_modem(vc->atom); + + __ofono_modem_dec_emergency_mode(modem); + } + } + + g_free(vc->dial_req->message); + vc->dial_req->message = NULL; + + g_free(vc->dial_req); + vc->dial_req = NULL; +} + static void ssn_mt_forwarded_notify(struct ofono_voicecall *vc, unsigned int id, int code, const struct ofono_phone_number *ph) -- 1.7.4.1