summaryrefslogtreecommitdiff
path: root/alarm-manager-schedule.c
diff options
context:
space:
mode:
Diffstat (limited to 'alarm-manager-schedule.c')
-rw-r--r--alarm-manager-schedule.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/alarm-manager-schedule.c b/alarm-manager-schedule.c
index bcf1f48..5837009 100644
--- a/alarm-manager-schedule.c
+++ b/alarm-manager-schedule.c
@@ -49,7 +49,7 @@ bool _alarm_schedule(void);
bool _clear_scheduled_alarm_list()
{
- g_slist_free_full(g_scheduled_alarm_list, g_free);
+ g_slist_free_full(g_scheduled_alarm_list, free);
g_scheduled_alarm_list = NULL;
return true;
@@ -89,18 +89,19 @@ bool _add_to_scheduled_alarm_list(__alarm_info_t *__alarm_info)
alarm->pid = __alarm_info->pid;
alarm->__alarm_info = __alarm_info;
- SECURE_LOGD("%s :alarm->uid =%d, alarm->pid =%d, app_service_name=%s(%u)\n",
+ SECURE_LOGD("%s :alarm->uid =%d, alarm->pid =%d, app_service_name=%s\n",
__FUNCTION__, alarm->uid, alarm->pid,
- g_quark_to_string(alarm->__alarm_info->quark_app_service_name),
- alarm->__alarm_info->quark_app_service_name);
+ alarm->__alarm_info->app_service_name);
- if (alarm->__alarm_info->quark_app_service_name != g_quark_from_string(WAKEUP_ALARM_APP_ID)) {
+ if (alarm->__alarm_info->app_service_name &&
+ strcmp(WAKEUP_ALARM_APP_ID, alarm->__alarm_info->app_service_name)) {
g_scheduled_alarm_list = g_slist_append(g_scheduled_alarm_list, alarm);
} else {
for (iter = g_scheduled_alarm_list; iter != NULL; iter = g_slist_next(iter)) {
count++;
entry = iter->data;
- if (entry->__alarm_info->quark_app_service_name != g_quark_from_string(WAKEUP_ALARM_APP_ID)) {
+ if (entry->__alarm_info->app_service_name &&
+ strcmp(WAKEUP_ALARM_APP_ID, entry->__alarm_info->app_service_name)) {
prior = true;
break;
}
@@ -128,7 +129,7 @@ bool _remove_from_scheduled_alarm_list(uid_t uid, alarm_id_t alarm_id)
alarm = iter->data;
if (alarm->uid == uid && alarm->alarm_id == alarm_id) {
g_scheduled_alarm_list = g_slist_remove(g_scheduled_alarm_list, iter->data);
- g_free(alarm);
+ free(alarm);
result = true;
break;
}