From 448e5884bb3adcd850483bb6ee1a48447417298e Mon Sep 17 00:00:00 2001 From: Changwoo KIM Date: Thu, 1 Aug 2019 10:42:21 +0900 Subject: [PATCH] Remove pause timer Do force resume only when LCD is on state. So we don't need to add timer for pause Change-Id: Ic2fd559b5f8b2feb5ad7c4d373c4f62d4ec1d925 Signed-off-by: hyunho --- watch-control/src/control.c | 52 +++++++------------------------------ 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/watch-control/src/control.c b/watch-control/src/control.c index b3b426cf..32a50277 100644 --- a/watch-control/src/control.c +++ b/watch-control/src/control.c @@ -55,7 +55,7 @@ static char *viewer_appid; static int __is_dead_signal_connected; static aul_app_com_connection_h __conn_dead_signal; static unsigned int __watch_rid; -static bool __is_bound; +static bool __is_bound = false; static int __viewer_visibility = AUL_SCREEN_STATUS_PAUSE; struct toolkit_info_s { @@ -75,7 +75,6 @@ struct manual_render_s { Ecore_Event_Handler *pre_visibility; Ecore_Event_Handler *visibility; guint timer; - guint pause_timer; bool started; }; @@ -91,15 +90,14 @@ static void __set_viewer_appid(void); static void __manual_render_start(bool force_resume); static void __manual_render_stop(void); -static bool __lcd_is_off(void) -{ +static bool __lcd_is_on(void) { int ret = 0; display_state_e state = DISPLAY_STATE_NORMAL; - ret = device_display_get_state(&state); - if (ret < 0 || state == DISPLAY_STATE_SCREEN_OFF) - return true; - return false; + + if(ret < 0 || state == DISPLAY_STATE_SCREEN_OFF) + return false; + return true; } static bool __watch_is_visible(void) @@ -124,36 +122,6 @@ static gboolean __manual_render_timeout_cb(gpointer data) return G_SOURCE_REMOVE; } -static gboolean __manual_render_pause_timeout_cb(gpointer data) -{ - int lcdoff = __lcd_is_off(); - - _W("Manual render pause timer is expired, lcdoff %d", lcdoff); - if (lcdoff) - watch_manager_notify_paused_status_of_viewer(); - - __manual_render.pause_timer = 0; - return G_SOURCE_REMOVE; -} - -static void __manual_render_set_pause_timer(void) -{ - if (__manual_render.pause_timer) - return; - - __manual_render.pause_timer = g_timeout_add(200, - __manual_render_pause_timeout_cb, NULL); -} - -static void __manual_render_unset_pause_timer(void) -{ - if (!__manual_render.pause_timer) - return; - - g_source_remove(__manual_render.pause_timer); - __manual_render.pause_timer = 0; -} - static void __manual_render_unset_timer(void) { if (!__manual_render.timer) @@ -199,11 +167,9 @@ static void __manual_render_start(bool force_resume) __manual_render.started = true; if (force_resume) { - watch_manager_notify_resumed_status_of_viewer(); - if (__lcd_is_off()) { - _W("Pause timer is started"); - __manual_render_unset_pause_timer(); - __manual_render_set_pause_timer(); + if (__lcd_is_on()) { + _W("Force resume watchface"); + watch_manager_notify_resumed_status_of_viewer(); } } } -- 2.34.1