From: Hwankyu Jhun Date: Wed, 12 Oct 2016 07:28:17 +0000 (+0900) Subject: Fix background management feature X-Git-Tag: accepted/tizen/3.0/common/20161114.105406^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F91921%2F1;p=platform%2Fcore%2Fappfw%2Fappcore-agent.git Fix background management feature - Change feature name - Remove build warning message in tv profile Change-Id: Ib1050887bd86ea5713c865692081a64100d02a42 Signed-off-by: Hwankyu Jhun --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 47ae7ff..f578f4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") SET(CMAKE_SKIP_BUILD_RPATH TRUE) -IF(_APPFW_FEATURE_BACKGROUND_MANAGEMENT) - ADD_DEFINITIONS("-D_APPFW_FEATURE_BACKGROUND_MANAGEMENT") -ENDIF(_APPFW_FEATURE_BACKGROUND_MANAGEMENT) +IF(_TIZEN_FEATURE_BACKGROUND_MANAGEMENT) + ADD_DEFINITIONS("-DTIZEN_FEATURE_BACKGROUND_MANAGEMENT") +ENDIF(_TIZEN_FEATURE_BACKGROUND_MANAGEMENT) ################################################################# # Build appcore-agent Library diff --git a/packaging/appcore-agent.spec b/packaging/appcore-agent.spec index 2ed30cf..82289a5 100644 --- a/packaging/appcore-agent.spec +++ b/packaging/appcore-agent.spec @@ -20,13 +20,13 @@ BuildRequires: pkgconfig(vconf-internal-keys) Service Application basic %if "%{?profile}" == "wearable" -%define appfw_feature_background_management 1 +%define tizen_feature_background_management 1 %else %if "%{?profile}" == "mobile" -%define appfw_feature_background_management 1 +%define tizen_feature_background_management 1 %else %if "%{?profile}" == "tv" -%define appfw_feature_background_management 0 +%define tizen_feature_background_management 0 %endif %endif %endif @@ -53,14 +53,14 @@ cp %{SOURCE1001} . %build -%if 0%{?appfw_feature_background_management} -_APPFW_FEATURE_BACKGROUND_MANAGEMENT=ON +%if 0%{?tizen_feature_background_management} +_TIZEN_FEATURE_BACKGROUND_MANAGEMENT=ON %endif MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %cmake -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ - -D_APPFW_FEATURE_BACKGROUND_MANAGEMENT:BOOL=${_APPFW_FEATURE_BACKGROUND_MANAGEMENT} \ + -D_TIZEN_FEATURE_BACKGROUND_MANAGEMENT:BOOL=${_TIZEN_FEATURE_BACKGROUND_MANAGEMENT} \ . %__make %{?_smp_mflags} diff --git a/src/appcore-agent.c b/src/appcore-agent.c index c16f7e3..93c685b 100644 --- a/src/appcore-agent.c +++ b/src/appcore-agent.c @@ -42,7 +42,7 @@ #include "appcore-agent.h" -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT #include #define RESOURCED_FREEZER_PATH "/Org/Tizen/Resourced/Freezer" @@ -265,7 +265,7 @@ static struct evt_ops evtops[] = { }, }; -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT static GDBusConnection *bus = NULL; static guint __suspend_dbus_handler_initialized = 0; #endif @@ -274,6 +274,7 @@ extern int app_control_create_event(bundle *data, struct app_control_s **app_con static int __sys_do(struct agent_appcore *ac, void *event_info, enum sys_event event); /* LCOV_EXCL_START */ +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT static int appcore_agent_flush_memory(void) { int (*flush_fn) (int); @@ -297,7 +298,6 @@ static int appcore_agent_flush_memory(void) /* LCOV_EXCL_START */ static void __prepare_to_suspend(void *data) { -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT int suspend = APPCORE_AGENT_SUSPENDED_STATE_WILL_ENTER_SUSPEND; struct agent_appcore *ac = data; @@ -306,14 +306,14 @@ static void __prepare_to_suspend(void *data) __sys_do(ac, &suspend, SE_SUSPENDED_STATE); ac->suspended_state = true; } -#endif } +#endif /* LCOV_EXCL_STOP */ /* LCOV_EXCL_START */ static void __exit_from_suspend(void *data) { -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT int suspend = APPCORE_AGENT_SUSPENDED_STATE_DID_EXIT_FROM_SUSPEND; struct agent_appcore *ac = data; @@ -327,9 +327,9 @@ static void __exit_from_suspend(void *data) /* LCOV_EXCL_START */ /* LCOV_EXCL_START */ +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT static gboolean __flush_memory(gpointer data) { -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT struct agent_appcore *ac = (struct agent_appcore *)data; appcore_agent_flush_memory(); @@ -341,15 +341,15 @@ static gboolean __flush_memory(gpointer data) _DBG("[__SUSPEND__] flush case"); __prepare_to_suspend(ac); -#endif return FALSE; } +#endif /* LCOV_EXCL_STOP */ /* LCOV_EXCL_START */ static void __add_suspend_timer(struct agent_appcore *ac) { -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT ac->tid = g_timeout_add_seconds(5, __flush_memory, ac); #endif } @@ -358,7 +358,7 @@ static void __add_suspend_timer(struct agent_appcore *ac) /* LCOV_EXCL_START */ static void __remove_suspend_timer(struct agent_appcore *ac) { -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT if (ac->tid > 0) { g_source_remove(ac->tid); ac->tid = 0; @@ -839,7 +839,7 @@ EXPORT_API int appcore_agent_set_event_callback(enum appcore_agent_event event, return r; } -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT static gboolean __init_suspend(gpointer data) { int r; @@ -897,7 +897,7 @@ EXPORT_API int appcore_agent_init(const struct agent_ops *ops, free(app_name); _retv_if(r == -1, -1); -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT g_idle_add(__init_suspend, NULL); #endif @@ -1007,7 +1007,7 @@ EXPORT_API int appcore_agent_main(int argc, char **argv, } /* LCOV_EXCL_START */ -#ifdef _APPFW_FEATURE_BACKGROUND_MANAGEMENT +#ifdef TIZEN_FEATURE_BACKGROUND_MANAGEMENT static void __suspend_dbus_signal_handler(GDBusConnection *connection, const gchar *sender_name, const gchar *object_path,