Change to use an aul function instead of app-manager

Change-Id: Id64630e122d74dfd25b8c98a439e7bf472e82ca0
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50f7ecf..1c9d2e6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-lsmack" )
 TARGET_LINK_LIBRARIES(${this_target} "-lpthread" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcrypto" )
 TARGET_LINK_LIBRARIES(${this_target} "-lsoup-2.4" )
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager" )
+TARGET_LINK_LIBRARIES(${this_target} "-laul" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-package-manager" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp-server -losp-appfw-server")
 

diff --git a/packaging/osp-channel-service.spec b/packaging/osp-channel-service.spec
index 1f2e832..07da431 100755 (executable)
--- a/packaging/osp-channel-service.spec
+++ b/packaging/osp-channel-service.spec
@@ -16,7 +16,6 @@ BuildRequires:        pkgconfig(libssl)
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(message-port)
 BuildRequires: pkgconfig(openssl)
-BuildRequires:  pkgconfig(capi-appfw-app-manager)
 BuildRequires:  pkgconfig(capi-appfw-package-manager)
 BuildRequires:  osp-appfw-internal-devel
 BuildRequires:  hash-signer

diff --git a/src/IpcServer.cpp b/src/IpcServer.cpp
index 2d13367..daef014 100644 (file)
--- a/src/IpcServer.cpp
+++ b/src/IpcServer.cpp
@@ -36,9 +36,9 @@
 
 #include <sys/smack.h>
 
-#include <ipc/ipc_message.h>
+#include <aul/aul.h>
 
-#include <app_manager.h>
+#include <ipc/ipc_message.h>
 
 #include <FBaseRtMutex.h>
 #include <FBaseSysLog.h>
@@ -347,12 +347,11 @@ IpcServer::OnConnectionRequest(GIOChannel* source, GIOCondition condition, gpoin
                pClientInfo->pIpcServer = pIpcServer;
                pClientInfo->clientId = cr.pid;
 
-               char* pAppId = NULL;
-               ret = app_manager_get_app_id(cr.pid, &pAppId);
-               SysTryCatch(NID_IO, ret >= 0, delete pClientInfo, E_SYSTEM, "[E_SYSTEM] Failed to get_app_id: %d", ret);
+               char buffer[256] = {0, };
+               ret = aul_app_get_appid_bypid(cr.pid, buffer, sizeof(buffer));
+               SysTryCatch(NID_IO, ret == AUL_R_OK, delete pClientInfo, E_SYSTEM, "[E_SYSTEM] Failed to get the application ID of pid: %d", ret);
 
-               pClientInfo->appId = pAppId;
-               free(pAppId);
+               pClientInfo->appId = buffer;
 
                pClientInfo->pReverseChannel = null;