From 068fbcf667d8a34768aee6315f079c6d39387b72 Mon Sep 17 00:00:00 2001 From: "gs86.lee" Date: Fri, 13 May 2016 20:36:01 +0900 Subject: [PATCH] [common] Fix logic to register vconfkey callback : VCONFKEY_BOOT_ANIMATION_FINISHED If 'VCONFKEY_BOOT_ANIMATION_FINISHED' is already 1, it is not necessary to register vconfkey callback function. Change-Id: I8040a81cc6b4ffd73e229018b84e91249b23f818 --- src/common/starter.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/common/starter.c b/src/common/starter.c index 899d638..8b4ab84 100755 --- a/src/common/starter.c +++ b/src/common/starter.c @@ -61,11 +61,7 @@ static void _hide_home(void) static void _show_home(void) { - int show_menu = 0; - - if (status_active_get()->starter_sequence || !show_menu) { - vconf_set_int(VCONFKEY_STARTER_SEQUENCE, 1); - } + vconf_set_int(VCONFKEY_STARTER_SEQUENCE, 1); } @@ -264,14 +260,25 @@ static void _init(struct appdata *ad) status_register(); status_active_register_cb(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS, _power_off_cb, NULL); - status_active_register_cb(STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED, _boot_animation_finished_cb, NULL); - /* Ordering : _hide_home -> process_mgr_must_launch(pwlock) -> _show_home */ - _hide_home(); + /* + * If 'VCONFKEY_BOOT_ANIMATION_FINISHED' is already 1, + * it is not necessary to register vconfkey callback function. + */ + if (status_active_get()->boot_animation_finished == 1) { + lock_mgr_daemon_start(); + _show_home(); + } else { + /* Ordering : _hide_home -> process_mgr_must_launch(pwlock) -> _show_home */ + _hide_home(); + #if 0 - process_mgr_must_launch(PWLOCK_LITE_PKG_NAME, NULL, NULL, _fail_to_launch_pwlock, _after_launch_pwlock); + process_mgr_must_launch(PWLOCK_LITE_PKG_NAME, NULL, NULL, _fail_to_launch_pwlock, _after_launch_pwlock); #endif + status_active_register_cb(STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED, _boot_animation_finished_cb, NULL); + } + hw_key_create_window(); home_mgr_init(NULL); -- 2.7.4