From: david_kim31 <david_kim31@samsung.com>
Date: Thu, 28 Mar 2013 13:50:31 +0000 (+0900)
Subject: Fix a jira issue related to Calendar alarm notification
X-Git-Tag: accepted/tizen_2.1/20130425.034849~202^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45380c325aff6cb3a7cba193a08e57962f1c68ae;p=platform%2Fframework%2Fnative%2Fappfw.git

Fix a jira issue related to Calendar alarm notification

Change-Id: I6e12934f776a61d47d2a71822996e615a336548b
Signed-off-by: david_kim31 <david_kim31@samsung.com>
---

diff --git a/src/system/FSysAlarm.cpp b/src/system/FSysAlarm.cpp
index fe8bd52..1cbd55f 100644
--- a/src/system/FSysAlarm.cpp
+++ b/src/system/FSysAlarm.cpp
@@ -73,9 +73,9 @@ Alarm::Set(const DateTime& startTime)
 result
 Alarm::Set(const DateTime& startTime, int period, const DateTime* pEndTime)
 {
-        result r = E_SUCCESS;
-        r = _AccessController::CheckUserPrivilege(_PRV_ALARM);
-        SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method."));
+	result r = E_SUCCESS;
+	r = _AccessController::CheckUserPrivilege(_PRV_ALARM);
+	SysTryReturn(NID_SYS, r == E_SUCCESS, E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, ("[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method."));
 
 	SysAssertf(__pAlarmImpl != null, "Not yet constructed. Construct() should be called before use.");
 	if(pEndTime != null)
diff --git a/src/system/FSys_AlarmImpl.cpp b/src/system/FSys_AlarmImpl.cpp
index 1996f5b..1db2659 100644
--- a/src/system/FSys_AlarmImpl.cpp
+++ b/src/system/FSys_AlarmImpl.cpp
@@ -149,9 +149,12 @@ _AlarmImpl::Cancel(void)
 
 	if(r != E_SUCCESS && r != E_INVALID_ARG)
 	{
-		SysLog(NID_SYS, "It is failed to register alarm. [%s]", GetErrorMessage(r));
+		SysLog(NID_SYS, "It is failed to cancel alarm. [%s]", GetErrorMessage(r));
 		r = E_SYSTEM;
 	}
+
+	__alarmId.value = 0;
+
 	return r;
 }
 
@@ -217,6 +220,9 @@ _AlarmImpl::OnAlarmExpired(int alarmId)
 		{
 			__pEvent->Fire(*pAlarmEventArg);
 		}
+
+		__alarmId.value = 0;
+
 		SysLog(NID_SYS, "Alarm Expired for alarm id: %d and listener called.", alarmId);
 	}
 	else