display: Add pmlock type and power lock type conversion

When the emit power lock state signal, it was omitted pmlock and power lock conversion from deviced.
For accurate signal emitting, this is necessary.

Change-Id: I59dc9eab4001812d86e76b4cc325ab3f8c9ba777
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>

diff --git a/src/display/display-lock.c b/src/display/display-lock.c
index 4d2f1cad0c1c70a79439587997c897c0ce05d365..2fe48ee4c496f7638eae13bf3308a0d4420f6a62 100644 (file)
--- a/src/display/display-lock.c
+++ b/src/display/display-lock.c
@@ -220,18 +220,28 @@ enum syscommon_deviced_display_state power_lock_type_to_pmlock(power_lock_e powe
        }
 }
 
-static void broadcast_lock_changed(enum syscommon_deviced_display_state state)
+static int display_state_lock_type_to_power_lock(enum syscommon_deviced_display_state display_state_lock)
 {
-       int nlock = 0;
-
-       switch(state) {
+       switch(display_state_lock) {
+       case SYSCOMMON_DEVICED_DISPLAY_STATE_OFF:
+               return POWER_LOCK_CPU;
        case SYSCOMMON_DEVICED_DISPLAY_STATE_ON:
+               return POWER_LOCK_DISPLAY;
        case SYSCOMMON_DEVICED_DISPLAY_STATE_DIM:
-       case SYSCOMMON_DEVICED_DISPLAY_STATE_OFF:
-               break;
+               return POWER_LOCK_DISPLAY_DIM;
        default:
-               return;
+               return -EINVAL;
        }
+}
+
+static void broadcast_lock_changed(enum syscommon_deviced_display_state state)
+{
+       int nlock = 0;
+       int power_lock_type = 0;
+
+       power_lock_type = display_state_lock_type_to_power_lock(state);
+       if (power_lock_type < 0)
+               return;
 
        nlock += g_list_length(g_display_fglock_list[state]);
        nlock += g_list_length(g_display_bglock_list[state]);
@@ -242,7 +252,7 @@ static void broadcast_lock_changed(enum syscommon_deviced_display_state state)
                DEVICED_PATH_DISPLAY,
                DEVICED_INTERFACE_DISPLAY,
                DEVICED_SIGNAL_POWER_LOCK_STATE_CHANGED,
-               g_variant_new("(ii)", state, nlock));
+               g_variant_new("(ii)", power_lock_type, nlock));
 }
 
 static void broadcast_lock_watchdog_expired(pid_t pid, enum syscommon_deviced_display_state state, const char* appid, time_t locktime)