Fix JIRA issue(TSAM-897) : Lockscreen is shown by ALARM_MANAGER on alarm from calenda...

Change-Id: Ie43f2f802f6f9792442ca3829c81a025080a79d8

diff --git a/src/common/lock_mgr.c b/src/common/lock_mgr.c
index 4074944..7bc8d53 100644 (file)
--- a/src/common/lock_mgr.c
+++ b/src/common/lock_mgr.c
@@ -42,8 +42,8 @@
 
 static struct {
        int checkfd;
-       alarm_id_t alarm_id;    /* -1 : None, others : set alarm */
-       Eina_Bool is_alarm;     /* EINA_TRUE : can use alarm EINA_FALSE : cannot use */
+       //alarm_id_t alarm_id;  /* -1 : None, others : set alarm */
+       //Eina_Bool is_alarm;   /* EINA_TRUE : can use alarm EINA_FALSE : cannot use */
 
        int old_lock_type;
        int lock_pid;
@@ -54,8 +54,8 @@ static struct {
 #endif
 } s_lock_mgr = {
        .checkfd = 0,
-       .alarm_id = -1,
-       .is_alarm = EINA_FALSE,
+       //.alarm_id = -1,
+       //.is_alarm = EINA_FALSE,
 
        .old_lock_type = 0,
        .lock_pid = -1,
@@ -82,6 +82,7 @@ int lock_mgr_get_lock_pid(void)
 
 
 
+#if 0
 static int _alarm_del(alarm_id_t id, void * user_param)
 {
        int ret = ALARMMGR_RESULT_SUCCESS;
@@ -164,7 +165,7 @@ static Eina_Bool _alarm_init(void)
 
        return EINA_TRUE;
 }
-
+#endif
 
 
 
@@ -318,10 +319,13 @@ static void _on_lcd_changed_receive(void *data, DBusMessage *msg)
                _W("LCD on");
                s_lock_mgr.lcd_state = LCD_STATE_ON;
 
+#if 0
                /* delete all alarm registering */
                _D("delete alarm : id(%d)", s_lock_mgr.alarm_id);
                _alarm_unset();
                s_lock_mgr.alarm_id = -1;
+
+#endif
        } else if (lcd_off) {
                s_lock_mgr.lcd_state = LCD_STATE_OFF;
 
@@ -413,8 +417,10 @@ static void _lock_daemon_init(void)
 {
        _SECURE_D("default lock screen pkg name is %s", status_passive_get()->setappl_3rd_lock_pkg_name_str);
 
+#if 0
        /* init alarm manager */
        s_lock_mgr.is_alarm = _alarm_init();
+#endif
 
        /* register lcd changed cb */
        dbus_util_receive_lcd_status(_on_lcd_changed_receive, NULL);

diff --git a/src/mobile/lock_mgr.c b/src/mobile/lock_mgr.c
index 63378a9..d128021 100644 (file)
--- a/src/mobile/lock_mgr.c
+++ b/src/mobile/lock_mgr.c
@@ -45,8 +45,8 @@
 
 static struct {
        int checkfd;
-       alarm_id_t alarm_id;    /* -1 : None, others : set alarm */
-       Eina_Bool is_alarm;     /* EINA_TRUE : can use alarm EINA_FALSE : cannot use */
+       //alarm_id_t alarm_id;  /* -1 : None, others : set alarm */
+       //Eina_Bool is_alarm;   /* EINA_TRUE : can use alarm EINA_FALSE : cannot use */
 
        int old_lock_type;
        int lock_pid;
@@ -57,8 +57,8 @@ static struct {
 #endif
 } s_lock_mgr = {
        .checkfd = 0,
-       .alarm_id = -1,
-       .is_alarm = EINA_FALSE,
+       //.alarm_id = -1,
+       //.is_alarm = EINA_FALSE,
 
        .old_lock_type = 0,
        .lock_pid = -1,
@@ -85,6 +85,7 @@ int lock_mgr_get_lock_pid(void)
 
 
 
+#if 0
 static int _alarm_del(alarm_id_t id, void * user_param)
 {
        int ret = ALARMMGR_RESULT_SUCCESS;
@@ -144,7 +145,6 @@ static void _alarm_lockscreen_launch(alarm_id_t alarm_id, void *data)
 
 
 
-#if 0
 static Eina_Bool _alarm_set(int sec)
 {
        time_t current_time;
@@ -198,7 +198,6 @@ static Eina_Bool _alarm_set(int sec)
 
        return EINA_TRUE;
 }
-#endif
 
 
 
@@ -225,7 +224,7 @@ static Eina_Bool _alarm_init(void)
 
        return EINA_TRUE;
 }
-
+#endif
 
 
 
@@ -419,10 +418,12 @@ static void _on_lcd_changed_receive(void *data, DBusMessage *msg)
                _W("LCD on");
                s_lock_mgr.lcd_state = LCD_STATE_ON;
 
+#if 0
                /* delete all alarm registering */
                _D("delete alarm : id(%d)", s_lock_mgr.alarm_id);
                _alarm_unset();
                s_lock_mgr.alarm_id = -1;
+#endif
 
                if (lock_pwd_util_win_visible_get()) {
                        _D("Password lock is ON");
@@ -578,8 +579,10 @@ static void _lock_daemon_init(void)
 {
        _SECURE_D("default lock screen pkg name is %s", status_passive_get()->setappl_3rd_lock_pkg_name_str);
 
+#if 0
        /* init alarm manager */
        s_lock_mgr.is_alarm = _alarm_init();
+#endif
 
        /* register lcd changed cb */
        dbus_util_receive_lcd_status(_on_lcd_changed_receive, NULL);