From: Taeyoung Kim Date: Thu, 14 Jan 2016 00:56:56 +0000 (+0900) Subject: display: SMAST is removed X-Git-Tag: accepted/tizen/ivi/20160223.231449~2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F56955%2F1;p=platform%2Fcore%2Fsystem%2Fdeviced.git display: SMAST is removed - SMAST is not supported from the platform deviced. Thus macro and related codes are removed Change-Id: I345d3cb14e755dd4ed85e7043246b30cdf88ef0b Signed-off-by: Taeyoung Kim --- diff --git a/src/display/core.c b/src/display/core.c index e1cdd12..0bb007b 100644 --- a/src/display/core.c +++ b/src/display/core.c @@ -643,17 +643,10 @@ static void update_display_time(void) /* third priority : lock state */ if ((get_lock_screen_state() == VCONFKEY_IDLE_LOCK) && !get_lock_screen_bg_state()) { - if (pm_status_flag & SMAST_FLAG) { - /* smart stay is on, timeout is always 5 seconds. */ - states[S_NORMAL].timeout = LOCK_SCREEN_CONTROL_TIMEOUT; - _I("LOCK : timeout is set, smart stay timeout(%d ms)", - LOCK_SCREEN_CONTROL_TIMEOUT); - } else { - /* timeout is different according to key or event. */ - states[S_NORMAL].timeout = lock_screen_timeout; - _I("LOCK : timeout is set by normal(%d ms)", - lock_screen_timeout); - } + /* timeout is different according to key or event. */ + states[S_NORMAL].timeout = lock_screen_timeout; + _I("LOCK : timeout is set by normal(%d ms)", + lock_screen_timeout); return; } @@ -1486,13 +1479,6 @@ static int default_trans(int evt) } } - /* smart stay */ - if (display_info.face_detection && - (pm_status_flag & SMAST_FLAG) && hallic_open) { - if (display_info.face_detection(evt, pm_cur_state, next_state)) - return 0; - } - /* state transition */ pm_old_state = pm_cur_state; pm_cur_state = next_state; diff --git a/src/display/core.h b/src/display/core.h index 4ac485e..6ad78cb 100644 --- a/src/display/core.h +++ b/src/display/core.h @@ -38,10 +38,9 @@ #define LOWBT_FLAG 0x00000100 #define CHRGR_FLAG 0x00000200 #define PWRSV_FLAG 0x00000400 -#define SMAST_FLAG 0x00001000 #define BRTCH_FLAG 0x00002000 #define PWROFF_FLAG 0x00004000 -#define DIMSTAY_FLAG 0x00008000 +#define DIMSTAY_FLAG 0x00008000 #define DEFAULT_NORMAL_TIMEOUT 30