Change lcdoff & lock lcdon time.

lcdoff : 5 seconds -> 1 seconds
lock lcdon time : 10 seconds -> 5 seconds

Change-Id: Ib48e08db5ccd526ae7148c6bc22ef85e379e4b27
Signed-off-by: Seunghun Pi <sh.pi@samsung.com>

diff --git a/device-daemon.in b/device-daemon.in
index 8fb6f1e..7260d7e 100644 (file)
--- a/device-daemon.in
+++ b/device-daemon.in
@@ -9,7 +9,7 @@ export PM_EXEC_PRG=@PREFIX@/bin/@IDLE_LOCK@
 
 export PM_TO_NORMAL=600 # normal state timeout seconds
 export PM_TO_LCDDIM=5 # dim state timeout seconds
-export PM_TO_LCDOFF=5 # off state timeout seconds
+export PM_TO_LCDOFF=1 # off state timeout seconds
 #export PM_TO_LCDOFF=0  # prevent suspend mode 
 
 export PM_SYS_DIMBRT=0

diff --git a/display/conf.c b/display/conf.c
index 070ecf3..00ce743 100644 (file)
--- a/display/conf.c
+++ b/display/conf.c
@@ -33,7 +33,7 @@ static const char *def_values[][IDX_END] = {
        {"PM_TO_START", "0"},
        {"PM_TO_NORMAL", "600"},
        {"PM_TO_LCDDIM", "5"},
-       {"PM_TO_LCDOFF", "5"},
+       {"PM_TO_LCDOFF", "1"},
        {"PM_TO_SLEEP", "0"},
        {"PM_SYS_POWER", "/sys/power/state"},
        {"PM_SYS_BRIGHT", "/sys/class/backlight/mobile-bl/brightness"},

diff --git a/display/core.c b/display/core.c
index 9d67012..3273170 100644 (file)
--- a/display/core.c
+++ b/display/core.c
@@ -114,13 +114,13 @@ static int trans_table[S_END][EVENT_END] = {
 #define MASK_MARGIN_TIMEOUT    (0x1 << 8)
 #define SHIFT_CHANGE_STATE     7
 #define CHANGE_STATE_BIT       0xF00   /* 1111 0000 0000 */
-#define LOCK_SCREEN_TIMEOUT    10
+#define LOCK_SCREEN_TIMEOUT    5
 #define SHIFT_LOCK_FLAG        16
 #define HOLD_KEY_BLOCK_BIT     0x1
 
 #define DEFAULT_NORMAL_TIMEOUT 30
 #define DEFAULT_DIM_TIMEOUT            5
-#define DEFAULT_OFF_TIMEOUT            5
+#define DEFAULT_OFF_TIMEOUT            1
 #define GET_HOLDKEY_BLOCK_STATE(x) ((x >> SHIFT_LOCK_FLAG) & HOLD_KEY_BLOCK_BIT)
 #define LOCK_SCREEN_WATING_TIME                50000   /* 50 ms */
 #define LOCK_SCREEN_WATING_MAX_COUNT   14      /* 50 * 14 : 700 ms at worst */
@@ -376,13 +376,15 @@ static int proc_condition(PMMsg *data)
        if (val != 0) {
                if ((val & 0x1)) {
                        reset_timeout(states[pm_cur_state].timeout);
-                       LOGINFO("reset timeout\n", "S_LCDOFF", pid, pname);
+                       LOGINFO("reset timeout (%d seconds)",
+                                       states[pm_cur_state].timeout);
                }
        } else {
                /* guard time for suspend */
                if (pm_cur_state == S_LCDOFF) {
-                       reset_timeout(5);
-                       LOGINFO("margin timeout (5 seconds)\n");
+                       reset_timeout(states[S_LCDOFF].timeout);
+                       LOGINFO("margin timeout (%d seconds)",
+                                       states[S_LCDOFF].timeout);
                }
        }