Merge branch 'master' into tizen_2.1

[framework/appfw/alarm-manager.git] / alarm-manager.c

diff --git a/alarm-manager.c b/alarm-manager.c
index 2698503..951b96b 100755 (executable)
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -274,7 +274,7 @@ int _set_rtc_time(time_t _time)
        rtc_tm.tm_year = time_r.tm_year;
        rtc_tm.tm_hour = time_r.tm_hour;
        rtc_tm.tm_min = time_r.tm_min;
-       rtc_tm.tm_sec = 0;
+       rtc_tm.tm_sec = time_r.tm_sec;
 
 
        retval0 = ioctl(fd0, RTC_SET_TIME, &rtc_tm);
@@ -1486,6 +1486,11 @@ static void __alarm_expired()
                                char appid[MAX_SERVICE_NAME_LEN] = { 0, };
                                char alarm_id_str[32] = { 0, };
 
+                               if (__alarm_info->alarm_info.alarm_type & ALARM_TYPE_WITHCB) {
+                                       __alarm_remove_from_list(__alarm_info->pid, alarm_id, NULL);
+                                       goto done;
+                               }
+
                                expire_info = malloc(sizeof(__expired_alarm_t));
                                if (G_UNLIKELY(NULL == expire_info)){
                                        ALARM_MGR_ASSERT_PRINT("[alarm-server]:Malloc failed!Can't notify alarm expiry info\n");