display: Remove ambient-mode(AOD) code 29/312629/2
authorYoungjae Cho <y0.cho@samsung.com>
Mon, 10 Jun 2024 08:28:28 +0000 (17:28 +0900)
committerYoungjae Cho <y0.cho@samsung.com>
Thu, 13 Jun 2024 02:39:50 +0000 (11:39 +0900)
Change-Id: Ia06d29e50c11b48b74bd544cedf699330bfb1301
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
29 files changed:
conf/display-profile-wearable.conf
plugins/mobile/display/core.c
plugins/mobile/display/device-interface.c
plugins/mobile/display/key-filter.c
plugins/tv/display/core.c
plugins/tv/display/device-interface.c
plugins/tv/display/key-filter.c
plugins/wearable/display/auto-brightness-sensorhub.c
plugins/wearable/display/core.c
plugins/wearable/display/device-interface.c
plugins/wearable/display/display-handler.c
plugins/wearable/display/key-filter.c
plugins/wearable/display/lbm.c
plugins/wearable/display/lbm.h
src/display/ambient-mode.c [deleted file]
src/display/ambient-mode.h [deleted file]
src/display/core.h
src/display/display-backlight.c
src/display/display-backlight.h
src/display/display-config.c
src/display/display-dbus.c
src/display/display-lock.c
src/display/display-panel.c
src/display/display-plugin.c
src/display/display-plugin.h
src/display/display-signal.c
src/display/display-signal.h
src/display/setting.c
src/shared/devices.h

index c8daba43c252dcf4976902a7170a86bfd0a7cbf9..92c3ffcf57b4cbdb8eaa23118c130c4ba92f7ee4 100644 (file)
@@ -50,5 +50,4 @@ Dimming=no
 LBMsupport=yes
 Level=4
 BrtTable=1,20,40,50,60,70,80,90,95,100
-AodBrightnessLevel=40
 
index fe1f10a806c1f880bf77c3e4f64f0f02a45a789a..ce1f21d32f1193ee921db2bab44fb6b4f05760e4 100644 (file)
@@ -44,7 +44,6 @@
 #include <hal/device/hal-device-power.h>
 
 #include <libsyscommon/log.h>
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "lock-detector.h"
@@ -117,8 +116,6 @@ static struct syscommon_deviced_display_config display_conf = {
        .timeout_enable         = true,
        .input_support          = true,
        .display_init_direction = SYSCOMMON_DEVICED_DISPLAY_ORIENTATION_HORIZONTAL,
-       .aod_enter_level        = 40,
-       .aod_tsp                = true,
        .touch_wakeup           = false,
        .display_on_usb_conn_changed = true,
        .display_dpms_type      = SYSCOMMON_DEVICED_DPMS_TYPE_WINDOW_MANAGER,
@@ -203,7 +200,6 @@ static int display_probe(void *data)
        dp->config = &display_conf;
        init_display_states(dp);
        setup_display_plugin_backlight_ops(dp);
-       dp->set_dim_state = NULL;
        dp->get_device_flags = NULL;
        dp->lcd_on_procedure = NULL;
        dp->lcd_off_procedure = NULL;
index 50f2aac88d6c1a61c4061817049b7593259a804d..9a8967cd9845ae0f3b7f00c33afcbf0fe5d6b1f7 100644 (file)
@@ -32,7 +32,6 @@
 #include <dlfcn.h>
 #include <hal/device/hal-display.h>
 
-#include "ambient-mode.h"
 #include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
@@ -57,8 +56,6 @@ inline struct display_backlight_ops *get_var_backlight_ops(void)
 static struct display_backlight_ops backlight_ops = {
        .set_brightness = NULL,
        .get_brightness = NULL,
-       .transit_state = NULL,
-       .transit_brt = NULL,
 };
 
 void setup_display_plugin_backlight_ops(struct display_plugin *dp)
index 0cd688b1bd6fec60232d393813b5e6917825160c..137a34ba3a3ec9c1e31dabb86fbf54bb6f75e6f3 100644 (file)
@@ -30,7 +30,6 @@
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include <linux/input.h>
 
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "device-interface.h"
@@ -213,11 +212,6 @@ static inline bool switch_on_lcd(enum device_flags flags)
        if (current_state_in_on())
                return false;
 
-       if (display_panel_get_dpms_cached_state() == SYSCOMMON_DEVICED_DPMS_ON) {
-               if (ambient_get_state() == false)
-                       return false;
-       }
-
        if (flags & LCD_ON_BY_POWER_KEY)
                broadcast_lcdon_by_powerkey();
        else if (flags & LCD_ON_BY_TOUCH)
index 953dede3d4577187cca6b2e4ba114909c1914e0b..f2d8b24eb713b4b05ea45b8003a4071a3b954ad7 100644 (file)
@@ -44,7 +44,6 @@
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include <hal/device/hal-device-power.h>
 
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "lock-detector.h"
@@ -115,8 +114,6 @@ static struct syscommon_deviced_display_config display_conf = {
        .timeout_enable         = true,
        .input_support          = true,
        .display_init_direction = SYSCOMMON_DEVICED_DISPLAY_ORIENTATION_HORIZONTAL,
-       .aod_enter_level        = 40,
-       .aod_tsp                = true,
        .touch_wakeup           = false,
        .display_on_usb_conn_changed = true,
        .display_dpms_type      = SYSCOMMON_DEVICED_DPMS_TYPE_WINDOW_MANAGER,
@@ -150,7 +147,6 @@ static int display_probe(void *data)
        dp->config = &display_conf;
        init_display_states(dp);
        setup_display_plugin_backlight_ops(dp);
-       dp->set_dim_state = NULL;
        dp->get_device_flags = NULL;
        dp->lcd_on_procedure = NULL;
        dp->lcd_off_procedure = NULL;
index 682f9c74dd32e899ded743d0853f698f0011f53d..8258f49ceb699ce1b93041930ad676ed506e2172 100644 (file)
@@ -32,7 +32,6 @@
 #include <dlfcn.h>
 #include <hal/device/hal-display.h>
 
-#include "ambient-mode.h"
 #include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
@@ -56,8 +55,6 @@ inline struct display_backlight_ops *get_var_backlight_ops(void)
 static struct display_backlight_ops backlight_ops = {
        .set_brightness = NULL,
        .get_brightness = NULL,
-       .transit_state = NULL,
-       .transit_brt = NULL,
 };
 
 void setup_display_plugin_backlight_ops(struct display_plugin *dp)
index 21883e80b2dc6a3279791bb70cd5e6ee523585ed..332c3c48d58170e8ff7111c30fffae9af5db5a81 100644 (file)
@@ -31,7 +31,6 @@
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include <linux/input.h>
 
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "device-interface.h"
@@ -223,11 +222,6 @@ static inline bool switch_on_lcd(enum device_flags flags)
        if (current_state_in_on())
                return false;
 
-       if (display_panel_get_dpms_cached_state() == SYSCOMMON_DEVICED_DPMS_ON) {
-               if (ambient_get_state() == false)
-                       return false;
-       }
-
        if (flags & LCD_ON_BY_POWER_KEY)
                broadcast_lcdon_by_powerkey();
        else if (flags & LCD_ON_BY_TOUCH)
index e04837cbac0ed3e25c612f7ddbfe6de0a865a996..43aadc4fb3d2d41197a52b1f9dbb50b0a8f2edc6 100644 (file)
@@ -104,12 +104,6 @@ void set_brightness_level(int level)
                auto_brightness_control(BR_HBM_OFF, BR_IMPLICIT);
                auto_brightness_control(BR_LBM_OFF, BR_IMPLICIT);
 
-               /* For AOD -> LCDON, brightness effect is deferred to this point */
-               if (current_brightness != default_brightness && !hold_brt && !lowdim) {
-                       change_brightness_transit(current_brightness, default_brightness);
-                       auto_brightness_control(BR_SET_BRIGHTNESS, default_brightness);
-               }
-
                break;
        default:
                /*
index 0696815b7508205b7f6fde0c99217b13354796e5..39bab8528834fb8895b5f08a83c4698075b09aaf 100644 (file)
@@ -46,7 +46,6 @@
 
 #include <libsyscommon/log.h>
 #include "auto-brightness-sensorhub.h"
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "lock-detector.h"
  * @{
  */
 
-#define LATE_LCD_TRANSIT               1
-
 static struct display_plugin *disp_plgn;
 static struct display_backlight_ops *backlight_ops;
 
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
-static guint transit_timer;
 /*
  * The two variables(lcdon_broadcast, pmstate_suspend) must be set initial
  * state because it should be sent from previous state at booting time.
@@ -143,8 +139,6 @@ static struct syscommon_deviced_display_config display_conf = {
        .timeout_enable         = true,
        .input_support          = true,
        .display_init_direction = SYSCOMMON_DEVICED_DISPLAY_ORIENTATION_HORIZONTAL,
-       .aod_enter_level        = 40,
-       .aod_tsp                = true,
        .touch_wakeup           = false,
        .display_on_usb_conn_changed = true,
        .display_dpms_type      = SYSCOMMON_DEVICED_DPMS_TYPE_WINDOW_MANAGER,
@@ -160,17 +154,6 @@ inline struct syscommon_deviced_display_state_info *state_st(enum syscommon_devi
        return &states[state];
 }
 
-static int display_auto_brightness_sensing(void *data)
-{
-       if (!transit_timer)
-               return 0;
-
-       g_source_remove(transit_timer);
-       transit_timer = 0;
-
-       return 0;
-}
-
 static int get_device_flags(unsigned long *device_flags)
 {
        if (!device_flags)
@@ -190,26 +173,9 @@ static int get_device_flags(unsigned long *device_flags)
                *device_flags |= TOUCH_SCREEN_OFF_MODE;
        }
 
-       if (ambient_get_state()) {
-               *device_flags |= AMBIENT_MODE;
-               *device_flags |= LCD_PHASED_TRANSIT_MODE;
-       }
-
        return 0;
 }
 
-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(SYSCOMMON_DEVICED_DPMS_ON);
-       return G_SOURCE_REMOVE;
-}
-
 static void lcd_on_procedure(int state, enum device_flags flag)
 {
        unsigned long flags = NORMAL_MODE;
@@ -240,23 +206,15 @@ static 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() == SYSCOMMON_DEVICED_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(SYSCOMMON_DEVICED_DISPLAY_STATE_ON);
@@ -267,9 +225,6 @@ static 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;
        }
 
@@ -308,41 +263,16 @@ static void lcd_off_procedure(enum device_flags flag)
 
        display_misc_set_touch_event_blocked(true);
 
-       if (flags & AMBIENT_MODE) {
-               if (ambient_get_state() == true)
-                       return;
-               ambient_set_state(true);
-       }
-
        set_setting_pmstate(SYSCOMMON_DEVICED_DISPLAY_STATE_OFF);
 
-       if (transit_timer) {
-               g_source_remove(transit_timer);
-               transit_timer = 0;
-       }
-
-       if (flags & LCD_PHASED_TRANSIT_MODE)
-               display_backlight_change_brightness_by_dpms_state(SYSCOMMON_DEVICED_DPMS_OFF);
-
        display_stop_dependent_device(flags);
 
-       if (flags & AMBIENT_MODE) {
-               broadcast_lcd_off_late(flags);
-       } else {
-               broadcast_lcd_off(SIGNAL_POST, flags);
-               syscommon_notifier_emit_notify(DEVICED_NOTIFIER_LCD_OFF_COMPLETE, NULL);
-       }
+       broadcast_lcd_off(SIGNAL_POST, flags);
+       syscommon_notifier_emit_notify(DEVICED_NOTIFIER_LCD_OFF_COMPLETE, NULL);
 
        enter_doze();
 }
 
-static void set_dim_state(bool on)
-{
-       _I("Dim state is %d.", on);
-       display_state_transition_update_display_state_timeout_by_priority();
-       states[get_pm_cur_state()].trans(EVENT_INPUT);
-}
-
 static inline bool check_lcd_is_on(void)
 {
        if (display_panel_get_dpms_cached_state() != SYSCOMMON_DEVICED_DPMS_ON)
@@ -933,7 +863,6 @@ static int display_probe(void *data)
        dp->config = &display_conf;
        init_display_states(dp);
        setup_display_plugin_backlight_ops(dp);
-       dp->set_dim_state = set_dim_state;
        dp->get_device_flags = get_device_flags;
        dp->lcd_on_procedure = lcd_on_procedure;
        dp->lcd_off_procedure = lcd_off_procedure;
@@ -984,8 +913,6 @@ static void display_init(void *data)
 
        register_kernel_uevent_control(&sec_dsim_uevent_ops);
 
-       syscommon_notifier_subscribe_notify(DEVICED_NOTIFIER_LCD_AUTOBRT_SENSING, display_auto_brightness_sensing);
-
        init_setting(update_setting);
        init_sysfs(flags);
        init_lcd_operation();
index 9ca5aeb3c53f902d59ccf6461c65ec5ebaf71bae..7f889adf4a71ad46a5fbc43830bc4229aa72c97a 100644 (file)
@@ -35,7 +35,6 @@
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include <system/syscommon-plugin-deviced-common-interface.h>
 
-#include "ambient-mode.h"
 #include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
 
 static struct display_backlight_ops backlight_ops;
 static struct battery_plugin *battery_plgn;
-static int aod_max_level = -1;
-static int aod_normal_level = -1;
-static int aod_min_level = -1;
-static int aod_charging_level = -1;
 static const struct syscommon_deviced_display_config *display_conf;
 static struct battery_status *battery = NULL;
 static struct battery_status* (*fp_get_var_battery_status)(void);
@@ -108,104 +103,9 @@ static int set_brightness(int val)
        return hal_device_display_set_brightness(val);
 }
 
-/* It was operated only AOD enter & leave */
-static int backlight_transit_state(int state)
-{
-       int brt, val;
-       int start, end;
-       static int aod_brightness_level;
-       int default_brightness = 0;
-
-       display_backlight_get_default_brightness(&default_brightness);
-
-       display_backlight_get_brightness(&brt);
-
-       if (state == SYSCOMMON_DEVICED_DPMS_OFF) {
-               start = brt;
-
-               /*
-                * The value of display_backlight_get_brightness is system brightness.
-                * But when device is LBM, the value is not same with real brightness.
-                * So it should be read exactly value for transit smooth effect
-                */
-               display_backlight_get_brightness(&val);
-
-               /* AOD brightness
-                *
-                * Compare current brightness with threshold based on charger's charging state.
-                * Charger charging state has 2 threshold: CHARGING, MIN
-                * The other states has 3 threshold: MAX, NORMAL, MIN
-                *
-                * Select the highest threshold among the thresholds less then the current brightness.
-                * If current brightness is less then MIN threshold, do not transit brightness.
-                *
-                * e.g.
-                * threshold for    | threshold for
-                * charger CHARGING | the other charger states
-                *                  |
-                *                  |
-                *                  |-----MAX(50)
-                *                  |
-                *                  |-----NORMAL(40)
-                *                  |
-                *                  |
-                * CHARGING(20)-----|
-                *                  |
-                *      MIN(10)-----|-----MIN(10)
-                *  if DISCHARGING and current brightness is 30, then AOD brightness will be 10.
-                *  if DISCHARGING and current brightness is 45, then AOD brightness will be 40.
-                *  if CHARGING and current brightness is 80, then AOD brightness will be 20.
-                *  if current brightness is 5, do not transit brightness.
-                */
-               if (aod_min_level > 0 && val < aod_min_level) {
-                       _W("Current brightness is already lower than minimum threshold.");
-                       return 0;
-               }
-
-               if (battery && battery->charge_now == CHARGER_CHARGING) {
-                       if (aod_charging_level > 0 && val >= aod_charging_level)
-                               aod_brightness_level = aod_charging_level;
-                       else if (aod_min_level > 0 && val >= aod_min_level)
-                               aod_brightness_level = aod_min_level;
-                       else
-                               aod_brightness_level = display_conf->aod_enter_level;
-               } else {
-                       if (aod_max_level > 0 && val >= aod_max_level)
-                               aod_brightness_level = aod_max_level;
-                       else if (aod_normal_level > 0 && val >= aod_normal_level)
-                               aod_brightness_level = aod_normal_level;
-                       else if (aod_min_level > 0 && val >= aod_min_level)
-                               aod_brightness_level = aod_min_level;
-                       else
-                               aod_brightness_level = display_conf->aod_enter_level;
-               }
-
-               if (val > aod_brightness_level) {
-                       _D("backlight transit start %d end %d DPMS OFF", start, aod_brightness_level);
-                       display_backlight_change_brightness(start, aod_brightness_level, display_conf->brightness_change_step);
-               }
-       } else {
-               /* prevent transit effect when another effect is already executed */
-               if (brt != aod_brightness_level) {
-                       _W("effect is already executed brt(%d) aod_level(%d)",
-                                       brt, aod_brightness_level);
-                       return 0;
-               }
-
-               start = aod_brightness_level;
-               end = default_brightness;
-               _D("backlight transit start %d end %d DPMS ON", start, end);
-               display_backlight_change_brightness(start, end, display_conf->brightness_change_step);
-       }
-
-       return 0;
-}
-
 static struct display_backlight_ops backlight_ops = {
        .set_brightness = set_brightness,
        .get_brightness = NULL,
-       .transit_state = backlight_transit_state,
-       .transit_brt = NULL,
 };
 
 int is_lcdon_blocked(void)
index 34696968f93fe5069e895039d3f5f238ad75f26e..c89af5a119a1b3f8bbbf6f41735951d0c7e53694 100644 (file)
@@ -47,34 +47,6 @@ enum charging_lcd_state {
        CHARGING_LCD_ON = 1,
 };
 
-static struct display_backlight_ops *backlight_ops;
-static guint autobrt_timer;
-static int autobrtlevel;
-
-static bool aod_clock_displayed; /* True while AOD screen is displayed */
-
-static gboolean lcdon_from_aod_cb(gpointer data)
-{
-       int level = (int)(intptr_t) data;
-
-       autobrt_timer = 0;
-
-       /* If it is still not turned on, do not apply auto brightness */
-       if (display_panel_get_dpms_cached_state() != SYSCOMMON_DEVICED_DPMS_ON)
-               return G_SOURCE_REMOVE;
-
-       display_backlight_change_brightness_by_dpms_state(SYSCOMMON_DEVICED_DPMS_ON);
-       set_brightness_level(level);
-
-       /* lcdon is completed, aod disappered */
-       aod_clock_displayed = false;
-
-       return G_SOURCE_REMOVE;
-}
-
-/* For AOD state, there is race condition between
- * HomeScreen dbus signal and AutoBrightnessChanged dbus method call.
- * Cannot decide which one arrives first */
 static GVariant *dbus_autobrightnesschanged(GDBusConnection *conn,
        const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
@@ -84,82 +56,13 @@ static GVariant *dbus_autobrightnesschanged(GDBusConnection *conn,
 
        g_variant_get(param, "(i)", &level);
 
-       /* If received level is identical to autobrt timer reserved level, ignore it. */
-       if (autobrt_timer && autobrtlevel == level) {
-               _D("Ignore autobrightness change request as same request(%d) is pending.", level);
-               return g_variant_new("(i)", ret);
-       }
-
-       if (autobrt_timer) {
-               g_source_remove(autobrt_timer);
-               autobrt_timer = 0;
-       }
-
        syscommon_notifier_emit_notify(DEVICED_NOTIFIER_LCD_AUTOBRT_SENSING, NULL);
 
-       /* When display state changes from AOD to LCDON, brightness change
-               * effect seems sluggish because of heavy load of jobs for turning on
-               * display. So delay this brightness change a bit to avoid this
-               * heavy loaded time and therefore make it change smoothly. */
-       if (aod_clock_displayed) {
-               autobrtlevel = level; /* reserve the level, defer applying */
-               autobrt_timer = g_timeout_add(200, lcdon_from_aod_cb, (gpointer)(intptr_t) level);
-       } else { /* SYSCOMMON_DEVICED_DISPLAY_STATE_ON state or LCDON from usual OFF state, not from AOD */
-               set_brightness_level(level);
-       }
+       set_brightness_level(level);
 
        return g_variant_new("(i)", ret);
 }
 
-static void aod_change_signal(GDBusConnection  *conn,
-                                                       const gchar      *sender,
-                                                       const gchar      *path,
-                                                       const gchar      *iface,
-                                                       const gchar      *name,
-                                                       GVariant         *param,
-                                                       gpointer          data)
-
-{
-       char *screen = NULL;
-
-       if (!g_variant_get_safe(param, "(s)", &screen)) {
-               _E("failed to get params from gvariant. expected:%s, type:%s", "(s)", g_variant_get_type_string(param));
-               goto out;
-       }
-
-       if (screen == NULL) {
-               _E("screen is null.");
-               goto out;
-       }
-
-       /* clock-viewer sends "clockchanged" as signal parameter when AOD->LCDON.
-        * On catching this signal, do change brightness immediately. */
-       if (!strcmp(screen, CLOCK_CHANGED)) {
-               /* aod_clock_displayed can be false if this clockchanged siganl arrives after 200ms timeout.
-                * In this situation, there is noting to do because all the
-                * brightness-related task, which should have been done in this routine,
-                * have been performed by timeout callback, lcdon_from_aod_cb(). */
-               if (!aod_clock_displayed)
-                       return;
-
-               display_backlight_change_brightness_by_dpms_state(SYSCOMMON_DEVICED_DPMS_ON);
-               if (autobrt_timer) { /* if there is reserved level, apply it */
-                       g_source_remove(autobrt_timer);
-                       autobrt_timer = 0;
-                       set_brightness_level(autobrtlevel);
-               }
-               /* lcdon is completed, aod disappered */
-               aod_clock_displayed = false;
-       } else if (!strcmp(screen, CLOCK_END)) {
-               /* lcdoff is completed, aod showed up */
-               aod_clock_displayed = true;
-       }
-
-out:
-       if (screen)
-               g_free(screen);
-}
-
 static const dbus_method_s dbus_methods[] = {
        { "AutoBrightnessChanged",   "i",   "i", dbus_autobrightnesschanged },
 };
@@ -196,16 +99,6 @@ static void display_handler_init(void *data)
        prepare_level_handler();
        syscommon_notifier_subscribe_notify(DEVICED_NOTIFIER_LCD, display_state_changed);
 
-       aod_clock_displayed = false;
-       ret = gdbus_signal_subscribe(NULL,
-                               DEVICED_OBJECT_PATH,
-                               DEVICED_INTERFACE_NAME,
-                               SIGNAL_HOMESCREEN,
-                               aod_change_signal,
-                               NULL, NULL);
-       if (ret <= 0)
-               _E("Failed to register signal handler: %d", ret);
-
        ret = sys_set_int(CHARGER_LCD_NODE, CHARGING_LCD_ON);
        if (ret < 0)
                _E("Can't write %s node.", CHARGER_LCD_NODE);
@@ -221,10 +114,3 @@ static const struct display_ops display_handler_ops = {
 };
 
 DISPLAY_OPS_REGISTER(&display_handler_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-}
index 3f2278068a080e46f3df2248279d81149a98b11d..b969e1c7d76e7739712894ea2e64b796cdb65537 100644 (file)
@@ -30,7 +30,6 @@
 #include <system/syscommon-plugin-deviced-common-interface.h>
 #include <linux/input.h>
 
-#include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"
 #include "device-interface.h"
@@ -205,11 +204,6 @@ static inline bool switch_on_lcd(enum device_flags flags)
        if (current_state_in_on())
                return false;
 
-       if (display_panel_get_dpms_cached_state() == SYSCOMMON_DEVICED_DPMS_ON) {
-               if (ambient_get_state() == false)
-                       return false;
-       }
-
        if (flags & LCD_ON_BY_POWER_KEY)
                broadcast_lcdon_by_powerkey();
        else if (flags & LCD_ON_BY_TOUCH)
@@ -636,7 +630,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
                        ignore = false;
                break;
        case EV_ABS:
-               if (display_misc_is_touch_event_blocked() && !ambient_get_state()
+               if (display_misc_is_touch_event_blocked()
                        && !g_display_plugin.config->touch_wakeup
                        && pinput->value == KEY_BEING_PRESSED)
                        return;
index 329aa0a07cc8a06b62acbaa90e4a16330843ee17..3ad50cf86478311c9aa697bf61a225eb041375f2 100644 (file)
@@ -44,7 +44,6 @@ static struct lbm_config lbm_conf = {
        .down_level = 0,
        .brt_table_size = 0,
        .brt_table = NULL,
-       .aod_brightness_level = 0,
 };
 
 static struct display_backlight_ops *backlight_ops;
index cec29d6dd51f9aea63dbb4aa64410d823f1eb1e4..ab0998250441e194814e5c38eb6d5724c1c4143f 100644 (file)
@@ -31,7 +31,6 @@ struct lbm_config {
        int down_level;
        int brt_table_size;
        int *brt_table;
-       int aod_brightness_level;
 };
 
 int lbm_get_state(void);
diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c
deleted file mode 100644 (file)
index 898152a..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * deviced
- *
- * Copyright (c) 2012 - 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdbool.h>
-#include <fcntl.h>
-#include <libsyscommon/libgdbus.h>
-#include <libsyscommon/common.h>
-#include <system/syscommon-plugin-deviced-common-interface.h>
-
-#include "core.h"
-#include "display.h"
-#include "display-lock.h"
-#include "display-ops.h"
-#include "display-panel.h"
-#include "display-plugin.h"
-#include "display-state-transition.h"
-#include "shared/log.h"
-#include "shared/device-notifier.h"
-#include "shared/devices.h"
-#include "shared/plugin.h"
-
-#define ON             "on"
-#define OFF            "off"
-
-#define SIGNAL_HOMESCREEN       "HomeScreen"
-
-#define SIGNAL_ALPMLCDOFF              "ALPMLCDOff"
-#define SIGNAL_ALPM_ON                 "ALPMOn"
-#define SIGNAL_ALPM_OFF                        "ALPMOff"
-
-#define CLOCK_START                    "clockstart"
-#define CLOCK_END                      "clockend"
-#define CLOCK_CHANGED                  "clockchanged"
-#define AMBIENT_CLOCK_WAITING_TIME     5000 /* ms */
-
-static struct display_plugin *disp_plgn;
-static int ambient_state;
-static int ambient_condition;  /* Setting Value */
-static pid_t ambient_pid;  /* Ambient Clock pid */
-static unsigned int update_count;
-
-void broadcast_ambient_state(int state)
-{
-       int ret;
-       char *signal;
-
-       signal = (state == true ? SIGNAL_ALPM_ON : SIGNAL_ALPM_OFF);
-       ret = gdbus_signal_emit(NULL,
-                                               DEVICED_PATH_DISPLAY,
-                                               DEVICED_INTERFACE_DISPLAY,
-                                               signal,
-                                               NULL);
-       if (ret < 0)
-               _E("Failed to send dbus signal(%s).", signal);
-}
-
-int ambient_get_condition(void)
-{
-       return ambient_condition;
-}
-
-int ambient_get_state(void)
-{
-       return ambient_state;
-}
-
-static void ambient_set_condition(keynode_t *key_nodes, void *data)
-{
-       int state, val;
-
-       if (key_nodes == NULL) {
-               _E("Wrong parameter, key_nodes is null.");
-               return;
-       }
-
-       val = vconf_keynode_get_bool(key_nodes);
-       if (val != ambient_condition) {
-               if (display_panel_get_dpms_cached_state() != SYSCOMMON_DEVICED_DPMS_ON)
-                       display_state_transition_request_state_transition_with_option(DEVICED_EVENT_DISPLAY_AMBIENT, LCD_NORMAL);
-       }
-
-       ambient_condition = val;
-       _I("Ambient mode condition is %d.", ambient_condition);
-
-       state = (ambient_condition == 0 ? 0 : 1);
-       syscommon_notifier_emit_notify(DEVICED_NOTIFIER_DISPLAY_AMBIENT_CONDITION, (void *)&state);
-
-       display_plugin_set_dim_state(state);
-}
-
-int ambient_set_state(int on)
-{
-       if (!ambient_condition)
-               return 0;
-
-       broadcast_ambient_state(on);
-
-       update_count = 0;
-
-       /**
-        * When display is turned off before going to AOD, Generally pm receives
-        * clock signal or ALPMLCDOFF signal and decides to go to AOD or not.
-        * But a specific case, the signal is not received.
-        * So at that time deviced should turn off display to match the pair.
-        */
-       if (on) {
-               display_lock_request_lock_with_option(DEVICED_EVENT_DISPLAY_AMBIENT,
-                               LCD_OFF, STAY_CUR_STATE, AMBIENT_CLOCK_WAITING_TIME);
-       } else
-               ambient_pid = 0;
-
-       _D("AMBIENT is %s.", (on ? ON : OFF));
-
-       ambient_state = on;
-
-       syscommon_notifier_emit_notify(DEVICED_NOTIFIER_DISPLAY_AMBIENT_STATE, (void *)&ambient_state);
-
-       return 0;
-}
-
-void ambient_check_invalid_state(pid_t pid)
-{
-       if (pid != DEVICED_EVENT_DISPLAY_AMBIENT)
-               return;
-
-       if (syscommon_is_emulator()) {
-               /* In emulator, deviced does not turn off the display. */
-               if (display_panel_get_dpms_cached_state() == SYSCOMMON_DEVICED_DPMS_ON)
-                       return;
-       }
-
-       if (ambient_get_state() == false)
-               return;
-
-       _I("Invalid state. Ambient state is change to off.");
-
-       /* If lcd_power is on and ambient state is true
-        * when pm state is changed to sleep,
-        * deviced doesn't get the clock signal.
-        * deviced just turns off lcd in this case.
-        */
-
-       display_state_transition_reset_state_transition_timeout(TIMEOUT_NONE);
-       lcd_direct_control(SYSCOMMON_DEVICED_DPMS_OFF, NORMAL_MODE);
-
-       broadcast_lcd_off_late(LCD_OFF_LATE_MODE);
-}
-
-static void ambient_start_clock(void)
-{
-       int ret;
-       enum syscommon_deviced_display_state current;
-
-       ret = display_state_get_current(&current);
-       if (ret < 0)
-               return;
-
-       if ((current == SYSCOMMON_DEVICED_DISPLAY_STATE_ON) ||
-           (current == SYSCOMMON_DEVICED_DISPLAY_STATE_DIM) ||
-           (ambient_state == false))
-               return;
-
-       display_lock_request_lock_with_option(DEVICED_EVENT_DISPLAY_AMBIENT, LCD_OFF, STAY_CUR_STATE,
-                       AMBIENT_CLOCK_WAITING_TIME);
-}
-
-static void ambient_end_clock(pid_t pid)
-{
-       int ret;
-       enum syscommon_deviced_display_state current;
-
-       ret = display_state_get_current(&current);
-       if (ret < 0)
-               return;
-
-       if ((current == SYSCOMMON_DEVICED_DISPLAY_STATE_ON) ||
-           (current == SYSCOMMON_DEVICED_DISPLAY_STATE_DIM) ||
-           (ambient_state == false))
-               return;
-
-       if (update_count == 0) {
-               _D("lcd off");
-
-               display_panel_set_panel_state_by_off_state(NORMAL_MODE);
-               broadcast_lcd_off_late(LCD_OFF_LATE_MODE);
-               display_lock_request_unlock_with_option(DEVICED_EVENT_DISPLAY_AMBIENT, LCD_OFF, PM_SLEEP_MARGIN);
-       }
-
-       update_count++;
-       if (update_count == UINT_MAX)
-               update_count = 1;
-       ambient_pid = pid;
-
-       _I("Enter real ambient state by process(%d).",
-           ambient_pid);
-}
-
-static void homescreen_signal_handler(GDBusConnection  *conn,
-       const gchar      *sender,
-       const gchar      *path,
-       const gchar      *iface,
-       const gchar      *name,
-       GVariant         *param,
-       gpointer          data)
-{
-       char *screen = NULL;
-       pid_t pid;
-
-       if (!g_variant_get_safe(param, "(s)", &screen)) {
-               _E("failed to get params from gvariant. expected:%s, type:%s", "(s)", g_variant_get_type_string(param));
-               goto out;
-       }
-
-       if (screen == NULL) {
-               _E("screen is null.");
-               goto out;
-       }
-       _D("screen : %s", screen);
-
-       pid = gdbus_connection_get_sender_pid(conn, sender);
-
-       if (!strncmp(screen, CLOCK_START, strlen(CLOCK_START)))
-               ambient_start_clock();
-       else if (!strncmp(screen, CLOCK_END, strlen(CLOCK_END)))
-               ambient_end_clock(pid);
-
-out:
-       if (screen)
-               g_free(screen);
-}
-
-static void ambient_lcdoff_signal_handler(GDBusConnection  *conn,
-       const gchar      *sender,
-       const gchar      *path,
-       const gchar      *iface,
-       const gchar      *name,
-       GVariant         *param,
-       gpointer          data)
-{
-       if (ambient_state == false) {
-               _E("It is not alpm mode.");
-               return;
-       }
-
-       display_lock_request_lock_with_option(DEVICED_EVENT_DISPLAY_AMBIENT, LCD_OFF, GOTO_STATE_NOW, 0);
-
-       _I("Display off in suspend state.");
-
-       ambient_set_state(false);
-       lcd_direct_control(SYSCOMMON_DEVICED_DPMS_OFF, NORMAL_MODE);
-
-       broadcast_lcd_off_late(LCD_OFF_LATE_MODE);
-       display_lock_request_unlock_with_option(DEVICED_EVENT_DISPLAY_AMBIENT, LCD_OFF, PM_SLEEP_MARGIN);
-}
-
-static void ambient_init(void *data)
-{
-       int ret;
-
-       ret = vconf_get_bool("db/starter/always_on_display", &ambient_condition);
-       if (ret < 0) {
-               _E("Failed to get initial AOD condition. AOD is not going to work.");
-               return;
-       } else {
-               _I("Ambient mode condition is %d.", ambient_condition);
-
-               vconf_notify_key_changed("db/starter/always_on_display",
-                       ambient_set_condition, NULL);
-       }
-       ret = gdbus_signal_subscribe(NULL,
-                               DEVICED_OBJECT_PATH,
-                               DEVICED_INTERFACE_NAME,
-                               SIGNAL_HOMESCREEN,
-                               homescreen_signal_handler,
-                               NULL, NULL);
-       if (ret <= 0)
-               _E("Failed to register signal handler: %d", ret);
-
-       ret = gdbus_signal_subscribe(NULL,
-                               DEVICED_OBJECT_PATH,
-                               DEVICED_INTERFACE_NAME,
-                               SIGNAL_ALPMLCDOFF,
-                               ambient_lcdoff_signal_handler,
-                               NULL, NULL);
-       if (ret <= 0)
-               _E("Failed to register signal handler: %d", ret);
-}
-
-static void ambient_exit(void *data)
-{
-       ambient_set_state(false);
-       vconf_ignore_key_changed("db/starter/always_on_display", ambient_set_condition);
-}
-
-static const struct display_ops ambient_ops = {
-       .name     = "ambient",
-       .init     = ambient_init,
-       .exit     = ambient_exit,
-};
-
-DISPLAY_OPS_REGISTER(&ambient_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       disp_plgn = get_var_display_plugin();
-       if (!disp_plgn)
-               _E("Failed to get display plugin variable.");
-}
diff --git a/src/display/ambient-mode.h b/src/display/ambient-mode.h
deleted file mode 100644 (file)
index 5b5e1f5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * deviced
- *
- * Copyright (c) 2012 - 2017 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __AMBIENT_MODE_H__
-#define __AMBIENT_MODE_H__
-
-#define AMBIENT_CLOCK_WAITING_TIME 5000 /* ms */
-
-int ambient_get_condition(void);
-int ambient_get_state(void);
-int ambient_set_state(int on);
-void ambient_check_invalid_state(pid_t pid);
-
-#endif /* __AMBIENT_MODE_H__ */
index 3d87ad42a2580756ef1b928a7d261924f7fa150d..e29a1136effec720db37cc6545013207722fc8e0 100644 (file)
@@ -77,7 +77,6 @@ void set_lock_screen_bg_state(bool state);
 /* core.c */
 int delete_condition(enum syscommon_deviced_display_state state);
 int custom_lcdoff(enum device_flags flag);
-void broadcast_lcd_off_late(enum device_flags flags);
 
 /* auto-brightness.c */
 void set_brightness_changed_state(void);
index a74707fc6ba76c8d34b34a8a58f417d26b5370eb..0116d7eb72f4e762ad7f37b80e2b18661538c566 100644 (file)
@@ -237,55 +237,6 @@ void display_backlight_change_brightness(int start, int end, int step)
                display_backlight_set_brightness_with_delay(start, LCD_PHASED_DELAY);
        }
 }
-
-/* FIXME: display_backlight_get_brightness is duplicated, this code structure should be changed */
-/* It was operated only AOD enter & leave. */
-int display_backlight_change_brightness_by_dpms_state(enum syscommon_deviced_dpms_state state)
-{
-       int brt, val;
-       int start, end;
-       int default_brightness;
-       int ret;
-
-       assert(g_display_plugin.config);
-
-       display_backlight_get_default_brightness(&default_brightness);
-
-       ret = display_plugin_backlight_transit_state((int) state);
-       if (ret == 0)
-               return 0;
-
-       display_backlight_get_brightness(&brt);
-
-       if (state == SYSCOMMON_DEVICED_DPMS_OFF) {
-               start = brt;
-               end = g_display_plugin.config->aod_enter_level;
-
-               /*
-                * The value of display_backlight_get_brightness is system brightness.
-                * But when device is LBM, the value is not same with real brightness.
-                * So it should be read exactly value for transit smooth effect
-                */
-               display_backlight_get_brightness(&val);
-
-               if (val > g_display_plugin.config->aod_enter_level)
-                       display_backlight_change_brightness(start, end, g_display_plugin.config->brightness_change_step);
-       } else {
-               /* prevent transit effect when another effect is already executed */
-               if (brt != g_display_plugin.config->aod_enter_level) {
-                       _W("effect is already executed brt(%d) aod_level(%d)",
-                                       brt, g_display_plugin.config->aod_enter_level);
-                       return 0;
-               }
-
-               start = g_display_plugin.config->aod_enter_level;
-               end = default_brightness;
-               display_backlight_change_brightness(start, end, g_display_plugin.config->brightness_change_step);
-       }
-
-       return 0;
-}
-
 int display_backlight_set_default_brightness(int brightness)
 {
        if (brightness < PM_MIN_BRIGHTNESS || brightness > PM_MAX_BRIGHTNESS) {
index 8f2153a250ad072877d460d7b1d6b184798de1c7..2634e19edee6d2210f14aa6f0eb40f5eb53069f6 100644 (file)
@@ -25,7 +25,6 @@
 struct display_backlight_ops {
        int (*set_brightness)(int val);
        int (*get_brightness)(int *val);
-       int (*transit_state)(int state);
        void (*transit_brt)(int start, int end, int step);
 };
 
@@ -35,7 +34,6 @@ int display_backlight_get_normalized_brightness(int raw_brightness,
 int display_backlight_set_brightness(int brightness);
 int display_backlight_get_brightness(int *brightness);
 void display_backlight_change_brightness(int start, int end, int step);
-int display_backlight_change_brightness_by_dpms_state(enum syscommon_deviced_dpms_state state);
 int display_backlight_set_default_brightness(int brightness);
 int display_backlight_get_default_brightness(int *brightness);
 int display_backlight_update_by_default_brightness(void);
index 6c96d05d20337204e80199353222f5de934bcbd2..6a36e0d72c07b464195f339c92a5e9dcf5a46807 100644 (file)
@@ -86,9 +86,6 @@ static int display_config_parse(struct parse_result *result, void *user_data)
        } else if (MATCH(result->name, "InputSupport")) {
                c->input_support = (MATCH(result->value, "yes") ? true : false);
                _D("Input is %s", c->input_support ? "supported" : "NOT supported");
-       } else if (MATCH(result->name, "AODTSP")) {
-               c->aod_tsp = (MATCH(result->value, "yes") ? true : false);
-               _D("TSP control at is %d at aod", c->aod_tsp);
        } else if (MATCH(result->name, "DisplayOnUsbConnChanged")) {
                c->display_on_usb_conn_changed = (MATCH(result->value, "yes") ? true : false);
        } else if (MATCH(result->name, "DisplayInitDirection")) {
index 2f511b1c44d84a8b261c343dfd5acbb5ec647123..cf7a1c182f74c1fc1cfd4233832e9a5bbd10a329 100644 (file)
@@ -33,7 +33,6 @@
 #include <device/display.h>
 #include <device/power.h>
 
-#include "ambient-mode.h"
 #include "core/log.h"
 #include "core.h"
 #include "lock-detector.h"
index 1f736581613b216b6145191cb8870a0017e9eb91..6c29531201b70d011e7bafaa660d4aca351dcf20 100644 (file)
@@ -25,7 +25,6 @@
 #include <system/syscommon-plugin-deviced-common-interface.h>
 
 #include "shared/common.h"
-#include "ambient-mode.h"
 #include "device-interface.h"
 #include "poll.h"
 //#include "display.h"
@@ -393,9 +392,6 @@ static gboolean lock_expired_callback(gpointer data)
        display_plugin_state_get_name(dl->state, &stname);
        _I("Display lock expired, state=%s pid=%d", stname, dl->pid);
 
-       if (dl->pid == DEVICED_EVENT_DISPLAY_AMBIENT)
-               ambient_check_invalid_state(dl->pid);
-
        if (dl->state == SYSCOMMON_DEVICED_DISPLAY_STATE_OFF)
                set_process_active(false, dl->pid);
 
index a75ea81049eb1ffb33c54950d8728a342542a970..7868375e1142d52bc0cbe75313a03da1d4f97ad8 100644 (file)
@@ -25,7 +25,6 @@
 #include "power/power.h"
 #include "power/power-suspend.h"
 #include "power/power-doze.h"
-#include "ambient-mode.h"
 #include "device-interface.h"
 #include "display-lock.h"
 #include "display-misc.h"
@@ -169,24 +168,14 @@ int display_panel_set_panel_state_by_on_state(enum device_flags flags)
 int display_panel_set_panel_state_by_off_state(enum device_flags flags)
 {
        int ret = -1;
-       static int cnt, ambient_cnt;
+       static int cnt;
        int default_brightness = 0;
 
        display_backlight_get_default_brightness(&default_brightness);
 
-       if (flags & AMBIENT_MODE) {
-               _I("[DPMS XLIB Backlight] LCD suspend %#x cnt:%d", flags, ambient_cnt);
-               ambient_cnt++;
-               return 0;
-       }
-
        _I("[DPMS XLIB Backlight] LCD off %#x cnt:%d", flags, cnt);
        cnt++;
 
-       if (flags & LCD_PHASED_TRANSIT_MODE)
-               display_backlight_change_brightness(default_brightness,
-                       LCD_PHASED_MIN_BRIGHTNESS, LCD_PHASED_CHANGE_STEP);
-
        if (flags & FORCE_OFF_MODE)
                ret = display_panel_set_dpms_state(SYSCOMMON_DEVICED_DPMS_FORCE_OFF, flags);
        else
@@ -536,14 +525,6 @@ int display_panel_get_dpms_state(void)
        if (ret < 0)
                return ret;
 
-       /**
-        * FIXME: Ambient mode is currently not the display core feature but wearable profile exclusive
-        *        feature. Therefore exclude this condition statement from the display core logic.
-        *        Please consider this condition statement when the ambient feature comes into the display core.
-        */
-       //if (val == DISPLAY_ON && ambient_get_state())
-       //      return SYSCOMMON_DEVICED_DPMS_OFF;
-
        switch (val) {
                case DISPLAY_ON:
                        return SYSCOMMON_DEVICED_DPMS_ON;
index f53190a3f9f227278e34c9324f4dcf4c3cf2c7ac..a9e558efa515acea540070ad9fa6cb352bbe482f 100644 (file)
@@ -131,14 +131,6 @@ int display_plugin_backlight_get_brightness(int *brightness)
        return -EOPNOTSUPP;
 }
 
-int display_plugin_backlight_transit_state(int state)
-{
-       if (g_display_plugin.backlight && g_display_plugin.backlight->transit_state)
-               return g_display_plugin.backlight->transit_state(state);
-
-       return -EOPNOTSUPP;
-}
-
 int display_plugin_backlight_transit_brightness(int start, int end, int step)
 {
        if (g_display_plugin.backlight && g_display_plugin.backlight->transit_brt) {
@@ -308,16 +300,6 @@ int display_plugin_config_get_pm_default_brightness(int *pm_default_brightness)
        return 0;
 }
 
-int display_plugin_set_dim_state(bool on)
-{
-       if (g_display_plugin.set_dim_state) {
-               g_display_plugin.set_dim_state(on);
-               return 0;
-       }
-
-       return -EOPNOTSUPP;
-}
-
 int display_plugin_get_device_flags(unsigned long *device_flags)
 {
        if (!device_flags)
index c289904ff66691fd8817e5db100f388380db9787..2456c97db5ffbd11344e61ec7feb41f9f34d0fb5 100644 (file)
@@ -58,7 +58,6 @@ struct display_plugin {
        bool system_wakeup_flag;
        int (*auto_brightness_control) (enum brightness_request_e request, int set_brightness);
        /* FIXME: function names will be redefined */
-       void (*set_dim_state) (bool on);
        int (*get_device_flags) (unsigned long *device_flags);
        void (*lcd_on_procedure) (int state, enum device_flags flag);
        void (*lcd_off_procedure) (enum device_flags flag);
@@ -81,7 +80,6 @@ extern struct display_plugin g_display_plugin;
 int display_plugin_get_system_wakeup_flag(bool *flag);
 int display_plugin_set_system_wakeup_flag(bool flag);
 int display_plugin_auto_brightness_control(enum brightness_request_e request, int set_brightness);
-int display_plugin_set_dim_state(bool on);
 int display_plugin_get_device_flags(unsigned long *device_flags);
 int display_plugin_lcd_on_procedure(int state, enum device_flags flag);
 int display_plugin_lcd_off_procedure(enum device_flags flag);
@@ -93,7 +91,6 @@ int display_plugin_set_power_save_mode_flag(int onoff);
 
 int display_plugin_backlight_set_brightness(int brightness);
 int display_plugin_backlight_get_brightness(int *brightness);
-int display_plugin_backlight_transit_state(int state);
 int display_plugin_backlight_transit_brightness(int start, int end, int step);
 
 /* FIXME: function names will be redefined */
index c8633657b5c1b1b0aa4e365f715e565d658152c3..7f251ac4e1c3d2971bb6fcacd3270f7489de2818 100644 (file)
@@ -96,18 +96,6 @@ void broadcast_lcd_off(enum signal_type type, enum device_flags flags)
                _E("Failed to send dbus signal(%s)", signal);
 }
 
-void broadcast_lcd_off_late(enum device_flags flags)
-{
-       static enum device_flags late_flags;
-
-       if (flags & LCD_OFF_LATE_MODE) {
-               broadcast_lcd_off(SIGNAL_POST, late_flags);
-               syscommon_notifier_emit_notify(DEVICED_NOTIFIER_LCD_OFF_COMPLETE, NULL);
-       } else {
-               late_flags = flags;
-       }
-}
-
 void set_process_active(bool flag, pid_t pid)
 {
        int ret;
index f245ea791dde92cbf086b03a1c4561de259e6dac..47cd1f22f7c7dbb389279b1d27cb7f05cf6fdcb5 100644 (file)
@@ -33,7 +33,6 @@ enum signal_type {
 
 void broadcast_lcd_on(enum signal_type type, enum device_flags flags);
 void broadcast_lcd_off(enum signal_type type, enum device_flags flags);
-void broadcast_lcd_off_late(enum device_flags flags);
 void set_process_active(bool flag, pid_t pid);
 
 void display_signal_register_display_brightness_notifier(void);
index b77f92d38d139d852b43a15e2866122692a5fbe7..0a106a17e717eae9ade515f02bf78efc50d97263 100644 (file)
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "ambient-mode.h"
 #include "core.h"
 #include "device-interface.h"
 #include "setting.h"
@@ -169,7 +168,7 @@ void get_dim_timeout(int *dim_timeout)
                return;
        }
 
-       if (!g_display_plugin.config->dimming || ambient_get_condition()) {
+       if (!g_display_plugin.config->dimming) {
                *dim_timeout = LCD_MIN_DIM_TIMEOUT;
                return;
        }
index ac125a0f6370f1d2bdb46bef5899faa12be923b0..cee2456ff42dd547486a34560ef7df00e332a63d 100644 (file)
 
 enum device_flags {
        NORMAL_MODE                   = 0x00000001,
-       AMBIENT_MODE                  = 0x00000002,
        FORCE_OFF_MODE                = 0x00000004,
        TOUCH_SCREEN_OFF_MODE         = 0x00002000,
        LCD_PANEL_OFF_MODE            = 0x00004000,
-       LCD_PHASED_TRANSIT_MODE       = 0x00008000,
        LCD_ON_BY_GESTURE             = 0x00010000,
        LCD_ON_BY_POWER_KEY           = 0x00020000,
        LCD_ON_BY_BACK_KEY            = 0x00040000,
@@ -57,7 +55,6 @@ enum device_flags {
        LCD_OFF_BY_POWER_KEY          = 0x02000000,
        LCD_OFF_BY_TIMEOUT            = 0x04000000,
        LCD_OFF_BY_EVENT              = 0x08000000,
-       LCD_OFF_LATE_MODE             = 0x10000000,
        LCD_OFF_BY_PROXIMITY          = 0x20000000,
        LCD_OFF_BY_GESTURE            = 0x40000000,
        LCD_OFF_BY_PALM               = 0x80000000,