fix prevent issue for AppControl

Change-Id: I116f0a6d7cd56d83d2566bbb13b1d327a0aa2587
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp
index 2411fd4..172c876 100644 (file)
--- a/src/app/FApp_AppControlImpl.cpp
+++ b/src/app/FApp_AppControlImpl.cpp
@@ -124,7 +124,7 @@ _AppControlImpl::CreateN(const String& path, const String& aId, const String& oI
 
        pImpl->_path = path;
        pImpl->_appId = aId;
-       pImpl->_opId = oId;
+       pImpl->_opId = (oId.IsEmpty()) ? TIZEN_OPERATION_MAIN : oId;
        pImpl->_property = prop;
 
        return pAc;
@@ -315,7 +315,8 @@ _AppControlImpl::Start(const String* pUriData, const String* pMimeType, const IM
                        req = _AppControlManager::GetInstance()->__inAppManager.InsertItem(pItem);
                }
 
-               if (_ThreadImpl::GetCurrentThreadImpl()->GetThreadType() == THREAD_TYPE_EVENT_DRIVEN)
+               const _ThreadImpl* pThreadImpl = _ThreadImpl::GetCurrentThreadImpl();
+               if (pThreadImpl && pThreadImpl->GetThreadType() == THREAD_TYPE_EVENT_DRIVEN)
                {
                        _AppControlResponseEvent* pAppControlResponseEvent = new (std::nothrow) _AppControlResponseEvent();
 

diff --git a/src/server/app/FApp_AulServer.cpp b/src/server/app/FApp_AulServer.cpp
index 33bd171..d6ef48b 100644 (file)
--- a/src/server/app/FApp_AulServer.cpp
+++ b/src/server/app/FApp_AulServer.cpp
@@ -54,12 +54,6 @@ using namespace Tizen::Base::Utility;
 namespace
 {
 
-const char _DESKTOP_FILE_PATH[] = "/opt/share/applications";
-const char _DESKTOP_FILE_PATH_FORMAT[] = "%s/%s.desktop";
-
-const char _X_TIZEN_SVC[] = "x-tizen-svc"; //X-TIZEN-SVC=[operation1] | [URI1] | [MIME1] ; [operation2] | [URI2] | [MIME2]
-const int _MAX_TIZEN_SVC_DESC_LEN = 1024;
-
 const int _MAX_CATEGORY = 12;
 const int _MAX_PACKAGE_ID_LENGTH = 10;
 
@@ -192,7 +186,7 @@ _AulServer::SetOnAppTerminatedCb(int (* pf_app_dead_handler)(int pid, void* pDat
 result
 _AulServer::TerminateApplicationByPid(int pid)
 {
-       int ret_aul = aul_subapp_terminate_request_pid(pid);
+       int ret_aul = aul_terminate_pid(pid);
        result r = E_SUCCESS;
 
        switch (ret_aul)