Enable all items of Screen timeout when dpm set 0

Change-Id: I7207786c6ad708a6881ddac63d62b4c1456bab23
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c
old mode 100644 (file)
new mode 100755 (executable)
index 9363ad8..be361bb
--- a/setting-display/src/setting-display-main.c
+++ b/setting-display/src/setting-display-main.c
@@ -130,10 +130,10 @@ static int get_max_inactivity_time_device_lock_handler(int *max_inactivity_time)
        return -1;
 }
 
-static void _pdm_handle(int radio_num, int max_inactivity_time,
+static void _dpm_handle(int radio_num, int max_inactivity_time,
                Setting_GenGroupItem_Data *data)
 {
-       if (timeout_val_list[radio_num] <= max_inactivity_time)
+       if (max_inactivity_time<=0 || timeout_val_list[radio_num] <= max_inactivity_time)
                setting_enable_genlist_item(data->item);
        else
                setting_disable_genlist_item(data->item);
@@ -186,7 +186,7 @@ static void setting_display_screen_timeout_popup(void *data)
                __BACK_POINTER_SET(ad->data_backlight_always_on);
 
 
-               _pdm_handle(0, max_inactivity_time,
+               _dpm_handle(0, max_inactivity_time,
                                ad->data_backlight_always_on);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_always_on is NULL");
@@ -208,7 +208,7 @@ static void setting_display_screen_timeout_popup(void *data)
                ad->data_backlight_15sec->userdata = ad;
                __BACK_POINTER_SET(ad->data_backlight_15sec);
 
-               _pdm_handle(1, max_inactivity_time, ad->data_backlight_15sec);
+               _dpm_handle(1, max_inactivity_time, ad->data_backlight_15sec);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_15sec is NULL");
        }
@@ -229,7 +229,7 @@ static void setting_display_screen_timeout_popup(void *data)
                ad->data_backlight_30sec->userdata = ad;
                __BACK_POINTER_SET(ad->data_backlight_30sec);
 
-               _pdm_handle(2, max_inactivity_time, ad->data_backlight_30sec);
+               _dpm_handle(2, max_inactivity_time, ad->data_backlight_30sec);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_30sec is NULL");
        }
@@ -247,7 +247,7 @@ static void setting_display_screen_timeout_popup(void *data)
        if (ad->data_backlight_1min) {
                ad->data_backlight_1min->userdata = ad;
                __BACK_POINTER_SET(ad->data_backlight_1min);
-               _pdm_handle(3, max_inactivity_time, ad->data_backlight_1min);
+               _dpm_handle(3, max_inactivity_time, ad->data_backlight_1min);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_1min is NULL");
        }
@@ -267,7 +267,7 @@ static void setting_display_screen_timeout_popup(void *data)
        if (ad->data_backlight_2min) {
                ad->data_backlight_2min->userdata = ad;
                __BACK_POINTER_SET(ad->data_backlight_2min);
-               _pdm_handle(4, max_inactivity_time, ad->data_backlight_2min);
+               _dpm_handle(4, max_inactivity_time, ad->data_backlight_2min);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_2min is NULL");
        }
@@ -289,7 +289,7 @@ static void setting_display_screen_timeout_popup(void *data)
                __BACK_POINTER_SET(ad->data_backlight_5min);
 
 
-               _pdm_handle(5, max_inactivity_time, ad->data_backlight_5min);
+               _dpm_handle(5, max_inactivity_time, ad->data_backlight_5min);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_5min is NULL");
        }
@@ -309,7 +309,7 @@ static void setting_display_screen_timeout_popup(void *data)
                ad->data_backlight_10min->userdata = ad;
                __BACK_POINTER_SET(ad->data_backlight_10min);
 
-               _pdm_handle(6, max_inactivity_time, ad->data_backlight_10min);
+               _dpm_handle(6, max_inactivity_time, ad->data_backlight_10min);
        } else {
                SETTING_TRACE_ERROR("ad->data_backlight_10min is NULL");
        }