From 86036438cca35e32c847555bc5e2804d45a54e92 Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Mon, 18 Sep 2017 14:07:56 +0900 Subject: [PATCH] Sync with tizen branch Change-Id: I881aa854c6af7f8b8d4b1b87e9a22f56d2652d98 Signed-off-by: Somin Kim --- doc/context_history_doc.h | 2 +- packaging/capi-context.spec | 4 ++-- src/history/context_history.cpp | 2 +- src/trigger/context_trigger.cpp | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/context_history_doc.h b/doc/context_history_doc.h index 3691377..4548a27 100644 --- a/doc/context_history_doc.h +++ b/doc/context_history_doc.h @@ -37,7 +37,7 @@ * * @section CAPI_CONTEXT_HISTORY_MODULE_FEATURE Related Features * This API is related with the following features:@n - * - http://tizen.org/feature/apphistory + * - http://tizen.org/feature/app_history * And some of the statistic items in this API are related with one of the following features:@n * - http://tizen.org/feature/battery * diff --git a/packaging/capi-context.spec b/packaging/capi-context.spec index 3728227..ec97118 100644 --- a/packaging/capi-context.spec +++ b/packaging/capi-context.spec @@ -1,6 +1,6 @@ Name: capi-context Summary: Tizen Context Framework Native API -Version: 1.0.5 +Version: 1.0.6 Release: 1 Group: Service Framework/Context License: Apache-2.0 @@ -14,10 +14,10 @@ BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(capi-appfw-app-control) -BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(cynara-creds-self) BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(cynara-client) +BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(context-app-history-client) BuildRequires: pkgconfig(context-job-scheduler-client) diff --git a/src/history/context_history.cpp b/src/history/context_history.cpp index 64a1037..2208e23 100644 --- a/src/history/context_history.cpp +++ b/src/history/context_history.cpp @@ -33,7 +33,7 @@ #define ASSERT_ALLOC(X) IF_FAIL_RETURN_TAG(X, E_NO_MEM, _E, "Memory allocation failed") #define ASSERT_NOT_NULL(X) IF_FAIL_RETURN_TAG(X, E_PARAM, _E, "Parameter null") -#define APP_HISTORY_FEATURE "http://tizen.org/feature/apphistory" +#define APP_HISTORY_FEATURE "http://tizen.org/feature/app_history" #define CHECK_APP_HISTORY_SUPPORTED(feature_name) \ do { \ bool is_supported = false; \ diff --git a/src/trigger/context_trigger.cpp b/src/trigger/context_trigger.cpp index c9a76d3..b78fc7b 100644 --- a/src/trigger/context_trigger.cpp +++ b/src/trigger/context_trigger.cpp @@ -532,6 +532,8 @@ EXPORT_API int context_trigger_rule_set_action_app_control(context_trigger_rule_ IF_FAIL_RETURN_TAG(bn, E_PARAM, _E, "Converting failed"); int ret = ctx_sched_job_set_app_control(rule->job, bn); + if (bn) + bundle_free(bn); if (ret == E_NONE) rule->hasAction = true; @@ -579,6 +581,8 @@ EXPORT_API int context_trigger_rule_set_action_notification(context_trigger_rule } int ret = ctx_sched_job_set_notification(rule->job, title, content, icon_path, bn); + if (bn) + bundle_free(bn); if (ret == E_NONE) rule->hasAction = true; -- 2.7.4