Fix JIRA issue(TSAM-954) : System settings API returns SYSTEM_SETTINGS_LOCK_STATE_UNL...

Change-Id: Ib902664955899e5d1b2af42fb86a59a3f4690183

diff --git a/src/mobile/hw_key.c b/src/mobile/hw_key.c
index b2c2de7..84cb1d7 100644 (file)
--- a/src/mobile/hw_key.c
+++ b/src/mobile/hw_key.c
@@ -528,7 +528,7 @@ void hw_key_destroy_window(void)
 #define CANCEL_KEY_TIMER_SEC 0.3
 
 
-const char *key_name[KEY_NAME_MAX] = {
+const char *key_name[38] = {
        "XF86AudioRaiseVolume",
        "XF86AudioLowerVolume",
        "XF86PowerOff",

diff --git a/src/mobile/lock_mgr.c b/src/mobile/lock_mgr.c
index e4e1d4a..63378a9 100644 (file)
--- a/src/mobile/lock_mgr.c
+++ b/src/mobile/lock_mgr.c
@@ -144,6 +144,7 @@ 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;
@@ -197,6 +198,7 @@ static Eina_Bool _alarm_set(int sec)
 
        return EINA_TRUE;
 }
+#endif
 
 
 
@@ -262,6 +264,11 @@ void lock_mgr_idle_lock_state_set(int lock_state)
        if (ret < 0) {
                _E("Failed to set vconfkey : VCONFKEY_IDLE_LOCK_STATE");
        }
+
+       ret = vconf_set_int(VCONFKEY_IDLE_LOCK_STATE_READ_ONLY, lock_state);
+       if (ret < 0) {
+               _E("Failed to set vconfkey : VCONFKEY_IDLE_LOCK_STATE_READ_ONLY");
+       }
 }
 
 
@@ -308,9 +315,9 @@ static void _other_lockscreen_unlock(void)
 
 
 
+#ifdef HAVE_X11
 static Eina_Bool _lock_create_cb(void *data, int type, void *event)
 {
-#ifdef HAVE_X11
        _D("lockw(%p), lock_pid(%d)", s_lock_mgr.lockw, s_lock_mgr.lock_pid);
 
        if (window_mgr_set_effect(s_lock_mgr.lockw, s_lock_mgr.lock_pid, event) == EINA_TRUE) {
@@ -319,15 +326,15 @@ static Eina_Bool _lock_create_cb(void *data, int type, void *event)
                        _E("window is not matched..!!");
                }
        }
-#endif
        return ECORE_CALLBACK_PASS_ON;
 }
+#endif
 
 
 
+#ifdef HAVE_X11
 static Eina_Bool _lock_show_cb(void *data, int type, void *event)
 {
-#ifdef HAVE_X11
        _D("lockw(%p), lock_pid(%d)", s_lock_mgr.lockw, s_lock_mgr.lock_pid);
 
        if (window_mgr_set_prop(s_lock_mgr.lockw, s_lock_mgr.lock_pid, event)) {
@@ -336,10 +343,10 @@ static Eina_Bool _lock_show_cb(void *data, int type, void *event)
 
                window_mgr_set_scroll_prop(s_lock_mgr.lockw, lock_type);
        }
-#endif
 
        return ECORE_CALLBACK_CANCEL;
 }
+#endif
 
 
 
@@ -366,6 +373,7 @@ void lock_mgr_unlock(void)
 
 
 
+#if 0
 #define LCD_OFF_ALARM_LOCK_TIME 5
 static void _lcd_off_by_timeout(void)
 {
@@ -393,6 +401,7 @@ static void _lcd_off_by_timeout(void)
                _alarm_lockscreen_launch(-1, NULL);
        }
 }
+#endif
 
 
 

diff --git a/src/mobile/starter.c b/src/mobile/starter.c
index 4d2ef09..03067c9 100644 (file)
--- a/src/mobile/starter.c
+++ b/src/mobile/starter.c
@@ -69,6 +69,7 @@ static void _show_home(void)
 
 
 
+#if 0
 static Eina_Bool _finish_boot_animation(void *data)
 {
        if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0) {
@@ -94,6 +95,7 @@ static void _after_launch_pwlock(int pid)
        process_mgr_set_pwlock_priority(pid);
        ecore_timer_add(0.5, _finish_boot_animation, NULL);
 }
+#endif