display: Remove unused codes related to AMBIENT in display plugins

At first, ambient module is initialized by vconfkey "db/starter/always_on_display".
However, that vconfkey is not exist in profiles except the wearable profile, so
ambient module initialization fails in other profiles.
Furthermore, that vconfkey sets the device flag "AMBIENT_MODE" and "LCD_PHASED_TRANSIT_MODE".
Thus, AMBIENT_MODE/LCD_PHASED_TRANSIT_MODE flags cannot be used in iot-headed/mobile/tv profile.

All the unused codes related to AMBIENT_MODE/LCD_PHASED_TRANSIT_MODE flags will be removed
from iot-headed/mobile/tv plugins.

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

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index a9c9caa..2dfd3d0 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -78,7 +78,6 @@
 #define LOCK_SCREEN_INPUT_TIMEOUT      10000
 #define LOCK_SCREEN_CONTROL_TIMEOUT    5000
 #define ALWAYS_ON_TIMEOUT              360000000
-#define LATE_LCD_TRANSIT                       1
 
 #define GESTURE_STR            "gesture"
 #define POWER_KEY_STR          "powerkey"
@@ -105,7 +104,6 @@ static unsigned int custom_dim_timeout = 0;
 int custom_holdkey_block = false;
 static char *custom_change_name;
 static guint lock_timeout_id;
-static guint transit_timer;
 static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
@@ -226,17 +224,6 @@ guint get_transition_timer(void)
        return timeout_src_id;
 }
 
-static int display_auto_brightness_sensing(void *data)
-{
-       if (!transit_timer)
-               return 0;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       return 0;
-}
-
 static const char* __device_flags_to_string(enum device_flags flags)
 {
        if (flags & LCD_ON_BY_GESTURE)
@@ -260,11 +247,6 @@ static unsigned long get_lcd_on_flags(void)
        if (lcd_paneloff_mode)
                flags |= LCD_PANEL_OFF_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        return flags;
 }
 
@@ -273,18 +255,6 @@ bool touch_event_blocked(void)
        return touch_blocked;
 }
 
-static gboolean late_transit_on(void *data)
-{
-       if (!transit_timer)
-               return G_SOURCE_REMOVE;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       display_backlight_change_brightness_by_dpms_state(DPMS_ON);
-       return G_SOURCE_REMOVE;
-}
-
 void lcd_on_procedure(int state, enum device_flags flag)
 {
        unsigned long flags = get_lcd_on_flags();
@@ -306,23 +276,15 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        _I("[lcdstep] 0x%lx", flags);
 
-       if (flags & AMBIENT_MODE) {
-               if (ambient_get_state() == false && display_panel_get_dpms_cached_state() == DPMS_ON)
-                       return;
-               ambient_set_state(false);
-       }
-
        /* send LCDOn dbus signal */
        if (!lcdon_broadcast)
                broadcast_lcd_on(SIGNAL_PRE, flags);
 
-       if (!(flags & LCD_PHASED_TRANSIT_MODE)) {
-               /* Update brightness level */
-               if (state == LCD_DIM)
-                       display_backlight_set_brightness_by_dim_brightness();
-               else if (state == LCD_NORMAL)
-                       display_backlight_update_by_default_brightness();
-       }
+       /* Update brightness level */
+       if (state == LCD_DIM)
+               display_backlight_set_brightness_by_dim_brightness();
+       else if (state == LCD_NORMAL)
+               display_backlight_update_by_default_brightness();
 
        if (state == LCD_NORMAL)
                set_setting_pmstate(S_NORMAL);
@@ -333,9 +295,6 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        if (!lcdon_broadcast) {
        broadcast_lcd_on(SIGNAL_POST, flags);
-               if (flags & LCD_PHASED_TRANSIT_MODE)
-                       transit_timer = g_timeout_add_seconds(LATE_LCD_TRANSIT,
-                                       late_transit_on, NULL);
                lcdon_broadcast = true;
        }
 
@@ -349,11 +308,6 @@ static unsigned long get_lcd_off_flags(void)
 {
        unsigned long flags = NORMAL_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        if (stay_touchscreen_off)
                flags |= TOUCH_SCREEN_OFF_MODE;
 
@@ -396,22 +350,10 @@ inline void lcd_off_procedure(enum device_flags flag)
        if (CHECK_OPS(keyfilter_ops, backlight_enable))
                keyfilter_ops->backlight_enable(false);
 
-       if (transit_timer) {
-               g_source_remove(transit_timer);
-               transit_timer = 0;
-       }
-
-       if (flags & LCD_PHASED_TRANSIT_MODE)
-               display_backlight_change_brightness_by_dpms_state(DPMS_OFF);
-
        display_stop_dependent_device(flags);
 
-       if (flags & AMBIENT_MODE) {
-               broadcast_lcd_off_late(flags);
-       } else {
-               broadcast_lcd_off(SIGNAL_POST, flags);
-               device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
-       }
+       broadcast_lcd_off(SIGNAL_POST, flags);
+       device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
 
        enter_doze();
 }
@@ -2039,7 +1981,6 @@ static void display_init(void *data)
        register_notifier(DEVICE_NOTIFIER_APPLICATION_FOREGROUND, display_app_foreground);
        register_notifier(DEVICE_NOTIFIER_APPLICATION_TERMINATED, display_app_terminated);
        register_notifier(DEVICE_NOTIFIER_BATTERY_HEALTH, battery_health_changed);
-       register_notifier(DEVICE_NOTIFIER_LCD_AUTOBRT_SENSING, display_auto_brightness_sensing);
        register_notifier(DEVICE_NOTIFIER_POWER_RESUME_FROM_ECHO_MEM, power_resume_from_echomem_callback);
        register_notifier(DEVICE_NOTIFIER_POWEROFF_TRIGGERED, poweroff_triggered_callback);
 

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 121cfae..1858eb0 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -79,7 +79,6 @@
 #define LOCK_SCREEN_INPUT_TIMEOUT      10000
 #define LOCK_SCREEN_CONTROL_TIMEOUT    5000
 #define ALWAYS_ON_TIMEOUT              360000000
-#define LATE_LCD_TRANSIT               1
 
 #define GESTURE_STR            "gesture"
 #define POWER_KEY_STR          "powerkey"
@@ -107,7 +106,6 @@ static unsigned int custom_dim_timeout = 0;
 int custom_holdkey_block = false;
 static char *custom_change_name;
 static guint lock_timeout_id;
-static guint transit_timer;
 static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
@@ -228,17 +226,6 @@ guint get_transition_timer(void)
        return timeout_src_id;
 }
 
-static int display_auto_brightness_sensing(void *data)
-{
-       if (!transit_timer)
-               return 0;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       return 0;
-}
-
 static const char* __device_flags_to_string(enum device_flags flags)
 {
 
@@ -267,11 +254,6 @@ static unsigned long get_lcd_on_flags(void)
        if (lcd_paneloff_mode)
                flags |= LCD_PANEL_OFF_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        return flags;
 }
 
@@ -280,18 +262,6 @@ bool touch_event_blocked(void)
        return touch_blocked;
 }
 
-static gboolean late_transit_on(void *data)
-{
-       if (!transit_timer)
-               return G_SOURCE_REMOVE;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       display_backlight_change_brightness_by_dpms_state(DPMS_ON);
-       return G_SOURCE_REMOVE;
-}
-
 void lcd_on_procedure(int state, enum device_flags flag)
 {
        unsigned long flags = get_lcd_on_flags();
@@ -313,23 +283,15 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        _I("[lcdstep] 0x%lx", flags);
 
-       if (flags & AMBIENT_MODE) {
-               if (ambient_get_state() == false && display_panel_get_dpms_cached_state() == DPMS_ON)
-                       return;
-               ambient_set_state(false);
-       }
-
        /* send LCDOn dbus signal */
        if (!lcdon_broadcast)
                broadcast_lcd_on(SIGNAL_PRE, flags);
 
-       if (!(flags & LCD_PHASED_TRANSIT_MODE)) {
-               /* Update brightness level */
-               if (state == LCD_DIM)
-                       display_backlight_set_brightness_by_dim_brightness();
-               else if (state == LCD_NORMAL)
-                       display_backlight_update_by_default_brightness();
-       }
+       /* Update brightness level */
+       if (state == LCD_DIM)
+               display_backlight_set_brightness_by_dim_brightness();
+       else if (state == LCD_NORMAL)
+               display_backlight_update_by_default_brightness();
 
        if (state == LCD_NORMAL)
                set_setting_pmstate(S_NORMAL);
@@ -340,9 +302,6 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        if (!lcdon_broadcast) {
        broadcast_lcd_on(SIGNAL_POST, flags);
-               if (flags & LCD_PHASED_TRANSIT_MODE)
-                       transit_timer = g_timeout_add_seconds(LATE_LCD_TRANSIT,
-                                       late_transit_on, NULL);
                lcdon_broadcast = true;
        }
 
@@ -356,11 +315,6 @@ static unsigned long get_lcd_off_flags(void)
 {
        unsigned long flags = NORMAL_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        if (stay_touchscreen_off)
                flags |= TOUCH_SCREEN_OFF_MODE;
 
@@ -403,22 +357,10 @@ inline void lcd_off_procedure(enum device_flags flag)
        if (CHECK_OPS(keyfilter_ops, backlight_enable))
                keyfilter_ops->backlight_enable(false);
 
-       if (transit_timer) {
-               g_source_remove(transit_timer);
-               transit_timer = 0;
-       }
-
-       if (flags & LCD_PHASED_TRANSIT_MODE)
-               display_backlight_change_brightness_by_dpms_state(DPMS_OFF);
-
        display_stop_dependent_device(flags);
 
-       if (flags & AMBIENT_MODE) {
-               broadcast_lcd_off_late(flags);
-       } else {
-               broadcast_lcd_off(SIGNAL_POST, flags);
-               device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
-       }
+       broadcast_lcd_off(SIGNAL_POST, flags);
+       device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
 
        enter_doze();
 }
@@ -2045,7 +1987,6 @@ static void display_init(void *data)
        register_notifier(DEVICE_NOTIFIER_APPLICATION_FOREGROUND, display_app_foreground);
        register_notifier(DEVICE_NOTIFIER_APPLICATION_TERMINATED, display_app_terminated);
        register_notifier(DEVICE_NOTIFIER_BATTERY_HEALTH, battery_health_changed);
-       register_notifier(DEVICE_NOTIFIER_LCD_AUTOBRT_SENSING, display_auto_brightness_sensing);
        register_notifier(DEVICE_NOTIFIER_POWER_RESUME_FROM_ECHO_MEM, power_resume_from_echomem_callback);
        register_notifier(DEVICE_NOTIFIER_POWEROFF_TRIGGERED, poweroff_triggered_callback);
 

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 3742db2..72f8f91 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -77,7 +77,6 @@
 #define LOCK_SCREEN_INPUT_TIMEOUT      10000
 #define LOCK_SCREEN_CONTROL_TIMEOUT    5000
 #define ALWAYS_ON_TIMEOUT              360000000
-#define LATE_LCD_TRANSIT               1
 
 #define GESTURE_STR            "gesture"
 #define POWER_KEY_STR          "powerkey"
@@ -105,7 +104,6 @@ static unsigned int custom_dim_timeout = 0;
 int custom_holdkey_block = false;
 static char *custom_change_name;
 static guint lock_timeout_id;
-static guint transit_timer;
 static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
 static struct timeval lcdon_tv;
 static int lcd_paneloff_mode = false;
@@ -226,17 +224,6 @@ guint get_transition_timer(void)
        return timeout_src_id;
 }
 
-static int display_auto_brightness_sensing(void *data)
-{
-       if (!transit_timer)
-               return 0;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       return 0;
-}
-
 static const char* __device_flags_to_string(enum device_flags flags)
 {
        if (flags & LCD_ON_BY_GESTURE)
@@ -260,11 +247,6 @@ static unsigned long get_lcd_on_flags(void)
        if (lcd_paneloff_mode)
                flags |= LCD_PANEL_OFF_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        return flags;
 }
 
@@ -273,18 +255,6 @@ bool touch_event_blocked(void)
        return touch_blocked;
 }
 
-static gboolean late_transit_on(void *data)
-{
-       if (!transit_timer)
-               return G_SOURCE_REMOVE;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       display_backlight_change_brightness_by_dpms_state(DPMS_ON);
-       return G_SOURCE_REMOVE;
-}
-
 void lcd_on_procedure(int state, enum device_flags flag)
 {
        unsigned long flags = get_lcd_on_flags();
@@ -306,23 +276,15 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        _I("[lcdstep] 0x%lx", flags);
 
-       if (flags & AMBIENT_MODE) {
-               if (ambient_get_state() == false && display_panel_get_dpms_cached_state() == DPMS_ON)
-                       return;
-               ambient_set_state(false);
-       }
-
        /* send LCDOn dbus signal */
        if (!lcdon_broadcast)
                broadcast_lcd_on(SIGNAL_PRE, flags);
 
-       if (!(flags & LCD_PHASED_TRANSIT_MODE)) {
-               /* Update brightness level */
-               if (state == LCD_DIM)
-                       display_backlight_set_brightness_by_dim_brightness();
-               else if (state == LCD_NORMAL)
-                       display_backlight_update_by_default_brightness();
-       }
+       /* Update brightness level */
+       if (state == LCD_DIM)
+               display_backlight_set_brightness_by_dim_brightness();
+       else if (state == LCD_NORMAL)
+               display_backlight_update_by_default_brightness();
 
        if (state == LCD_NORMAL)
                set_setting_pmstate(S_NORMAL);
@@ -333,9 +295,6 @@ void lcd_on_procedure(int state, enum device_flags flag)
 
        if (!lcdon_broadcast) {
        broadcast_lcd_on(SIGNAL_POST, flags);
-               if (flags & LCD_PHASED_TRANSIT_MODE)
-                       transit_timer = g_timeout_add_seconds(LATE_LCD_TRANSIT,
-                               late_transit_on, NULL);
                lcdon_broadcast = true;
        }
 
@@ -349,11 +308,6 @@ static unsigned long get_lcd_off_flags(void)
 {
        unsigned long flags = NORMAL_MODE;
 
-       if (ambient_get_condition() == true) {
-               flags |= AMBIENT_MODE;
-               flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        if (stay_touchscreen_off)
                flags |= TOUCH_SCREEN_OFF_MODE;
 
@@ -396,22 +350,10 @@ inline void lcd_off_procedure(enum device_flags flag)
        if (CHECK_OPS(keyfilter_ops, backlight_enable))
                keyfilter_ops->backlight_enable(false);
 
-       if (transit_timer) {
-               g_source_remove(transit_timer);
-               transit_timer = 0;
-       }
-
-       if (flags & LCD_PHASED_TRANSIT_MODE)
-               display_backlight_change_brightness_by_dpms_state(DPMS_OFF);
-
        display_stop_dependent_device(flags);
 
-       if (flags & AMBIENT_MODE) {
-               broadcast_lcd_off_late(flags);
-       } else {
-               broadcast_lcd_off(SIGNAL_POST, flags);
-               device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
-       }
+       broadcast_lcd_off(SIGNAL_POST, flags);
+       device_notify(DEVICE_NOTIFIER_LCD_OFF_COMPLETE, NULL);
 
        enter_doze();
 }
@@ -2036,7 +1978,6 @@ static void display_init(void *data)
        register_notifier(DEVICE_NOTIFIER_APPLICATION_FOREGROUND, display_app_foreground);
        register_notifier(DEVICE_NOTIFIER_APPLICATION_TERMINATED, display_app_terminated);
        register_notifier(DEVICE_NOTIFIER_BATTERY_HEALTH, battery_health_changed);
-       register_notifier(DEVICE_NOTIFIER_LCD_AUTOBRT_SENSING, display_auto_brightness_sensing);
        register_notifier(DEVICE_NOTIFIER_POWER_RESUME_FROM_ECHO_MEM, power_resume_from_echomem_callback);
        register_notifier(DEVICE_NOTIFIER_POWEROFF_TRIGGERED, poweroff_triggered_callback);