summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyunwoo Kim <hwlove.kim@samsung.com>2013-06-18 17:46:51 +0900
committerHyunwoo Kim <hwlove.kim@samsung.com>2013-06-18 17:50:13 +0900
commit58439a08ec614d9eb596e5990a517d80cc0a4484 (patch)
treea1704d1a61695e250ff5c6dca8e072af39e6065c
parentcfa4df52fc76328d6db8ea2e67f94e1a674234d7 (diff)
downloadprivacy-manager-58439a08ec614d9eb596e5990a517d80cc0a4484.tar.gz
privacy-manager-58439a08ec614d9eb596e5990a517d80cc0a4484.tar.bz2
privacy-manager-58439a08ec614d9eb596e5990a517d80cc0a4484.zip
Add upgrade api to pkgmgr plugin
Change-Id: I5867b7e09dbac2bb6e5c99b00e36b00a256b5182 Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>
-rwxr-xr-xpackaging/privacy-manager.spec8
-rw-r--r--pkgmgr_plugin/privileges.cpp26
2 files changed, 26 insertions, 8 deletions
diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index d367ba6..4efcc00 100755
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -1,7 +1,7 @@
Name: privacy-manager-server
Summary: Privacy Management
Version: 0.0.3
-Release: 4
+Release: 5
Group: System/Libraries
License: SAMSUNG
Source0: %{name}-%{version}.tar.gz
@@ -110,15 +110,13 @@ echo cmake . -DPREFIX=%{_prefix} \
-DLIBDIR=%{_libdir} \
-DINCLUDEDIR=%{_includedir} \
-DCMAKE_BUILD_TYPE=%{build_type} \
- -DVERSION=%{version} \
- -DDPL_LOG="ON"
+ -DVERSION=%{version}
cmake . -DPREFIX=%{_prefix} \
-DEXEC_PREFIX=%{_exec_prefix} \
-DLIBDIR=%{_libdir} \
-DINCLUDEDIR=%{_includedir} \
-DCMAKE_BUILD_TYPE=%{build_type} \
- -DVERSION=%{version} \
- -DDPL_LOG="ON"
+ -DVERSION=%{version}
make %{?jobs:-j%jobs}
%install
diff --git a/pkgmgr_plugin/privileges.cpp b/pkgmgr_plugin/privileges.cpp
index c325b51..72a3790 100644
--- a/pkgmgr_plugin/privileges.cpp
+++ b/pkgmgr_plugin/privileges.cpp
@@ -105,7 +105,7 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
destroy_char_list(ppPrivilegeList, privilegeList.size() + 1);
if (ret != PRIV_MGR_ERROR_SUCCESS)
{
- LOGD("Failed to install privacy : %d", ret);
+ LOGD("Failed to install privacy info: %d", ret);
return -EINVAL;
}
@@ -123,12 +123,12 @@ int PKGMGR_PARSER_PLUGIN_UNINSTALL(xmlDocPtr docPtr, const char* packageId)
int res = privacy_manager_client_uninstall_privacy_by_server(packageId);
if (res != PRIV_MGR_ERROR_SUCCESS)
{
- LOGD("Failed to uninstall privacy in server: %d", res);
+ LOGD("Failed to uninstall privacy info in server: %d", res);
res = privacy_manager_client_uninstall_privacy(packageId);
if (res != PRIV_MGR_ERROR_SUCCESS)
{
- LOGD("Failed to uninstall privacy: %d", res);
+ LOGD("Failed to uninstall privacy info: %d", res);
return -EINVAL;
}
}
@@ -136,3 +136,23 @@ int PKGMGR_PARSER_PLUGIN_UNINSTALL(xmlDocPtr docPtr, const char* packageId)
LOGI("leave");
return 0;
}
+
+extern "C"
+__attribute__ ((visibility("default")))
+int PKGMGR_PARSER_PLUGIN_UPGRADE(xmlDocPtr docPtr, const char* packageId)
+{
+ int res = 0;
+
+ res = PKGMGR_PARSER_PLUGIN_UNINSTALL(docPtr, packageId);
+ if (res != 0)
+ {
+ LOGD("Privacy info can be already uninstalled");
+ }
+
+ res = PKGMGR_PARSER_PLUGIN_INSTALL(docPtr, packageId);
+ if (res != 0)
+ {
+ LOGD("Failed to install privacy Info: %d", res);
+ }
+ return res;
+} \ No newline at end of file