remove redundant IPC calls

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

diff --git a/inc/FApp_AppManagerService.h b/inc/FApp_AppManagerService.h
old mode 100755 (executable)
new mode 100644 (file)
index 0682762..b13f002
--- a/inc/FApp_AppManagerService.h
+++ b/inc/FApp_AppManagerService.h
@@ -56,12 +56,9 @@ public:
 
        result Construct(_ContextManager* pContextMgr, _IAppManagerServiceEventListener* pStub);
 
-       virtual result LaunchApplication(const AppId& appId, int req);
        virtual result TerminateApplication(const AppId& appId);
-       virtual bool IsRunning(const AppId& appId);
-       virtual result GetRunningAppList(Tizen::Base::Collection::ArrayList* pArray);
-       virtual result RegisterApplication(const Tizen::Base::String& packageID, const Tizen::Base::String& executableName, _AppType appType, int pid);
-       virtual result RegisterApplication(const Tizen::Base::String& packageID, const Tizen::Base::String& executableName, _AppType appType, int pid, int clientId);
+       virtual result RegisterApplication(const AppId& appId, _AppType appType, int pid);
+       virtual result RegisterApplication(const AppId& appId, _AppType appType, int pid, int clientId);
        virtual result UnregisterApplication(int pid);
 
        virtual result InitEventListener( _IAppManagerServiceEventListener* pListener);

diff --git a/inc/FApp_AppManagerStub.h b/inc/FApp_AppManagerStub.h
old mode 100755 (executable)
new mode 100644 (file)
index bf5b393..6f6c97c
--- a/inc/FApp_AppManagerStub.h
+++ b/inc/FApp_AppManagerStub.h
@@ -60,11 +60,8 @@ public:
        result Construct(_ContextManager* pContextMgr);
 
        // handlers
-       bool OnLaunchApplication(const AppId& appID, int req);
        bool OnTerminateApplication(const AppId& appID, result *pRes);
-       bool OnIsRunning(const AppId& appID, bool *pRes);
-       bool OnGetRunningAppList(Tizen::Base::Collection::ArrayList* pArray, result *pRes);
-       bool OnRegisterApplication(const PackageId& packageId, const Tizen::Base::String& executableName, int appType, int pid);
+       bool OnRegisterApplication(const AppId& appId, int appType, int pid);
        bool OnUnregisterApplication(int pid);
        bool OnAddEventListener(int pid);
        bool OnRemoveEventListener(int pid);

diff --git a/plugins/alarm-condition-handler/AlarmConditionHandler.cpp b/plugins/alarm-condition-handler/AlarmConditionHandler.cpp
index bed432e..54c51ae 100644 (file)
--- a/plugins/alarm-condition-handler/AlarmConditionHandler.cpp
+++ b/plugins/alarm-condition-handler/AlarmConditionHandler.cpp
@@ -514,7 +514,7 @@ _AlarmConditionHandler::SettingEventCb(keynode_t* node, void* userData)
        _AppLaunchCondition* pAppLaunchCondition = null;
        _AppLaunchCondition* pNewAppLaunchCondition;
        IMapEnumerator* pMapEnum;
-       IEnumerator* pEnum;
+       //IEnumerator* pEnum;
        Tizen::Base::Collection::HashMap updateList;
 
        SysLog(NID_SYS, "Alarm setting event cb is invoked");
@@ -600,13 +600,12 @@ _AlarmConditionHandler::GetAppLaunchConditionN(const AppId& appId, const Tizen::
        SysTryCatch(NID_SYS, pAppLaunchCondition != null, r = E_OUT_OF_MEMORY, r, "It is failed to create pAppLaunchCondition");
 
        r = pAppLaunchCondition->Construct(appId, condition, null, AppManager::LAUNCH_OPTION_DEFAULT, null);
-       SysTryCatch(NID_SYS, !IsFailed(r), r, r, "It is failed to pAppLaunchCondition->Constructor");
+       SysTryCatch(NID_SYS, !IsFailed(r), , r, "It is failed to pAppLaunchCondition->Constructor");
 
        return pAppLaunchCondition;
 
 CATCH:
-       if(pAppLaunchCondition != null)
-               delete pAppLaunchCondition;
+       delete pAppLaunchCondition;
 
        return null;
 }

diff --git a/src/FApp_AppManagerService.cpp b/src/FApp_AppManagerService.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 26ae398..6f1029f
--- a/src/FApp_AppManagerService.cpp
+++ b/src/FApp_AppManagerService.cpp
@@ -77,13 +77,6 @@ _AppManagerService::Construct(_ContextManager *pContextMgr, _IAppManagerServiceE
 ///////////////////////////////////////////
 
 result
-_AppManagerService::LaunchApplication(const AppId& appId, int req)
-{
-       SysLog(NID_APP, "app(%ls)", appId.GetPointer());
-       return E_SUCCESS;
-}
-
-result
 _AppManagerService::TerminateApplication(const AppId& appId)
 {
        SysTryReturnResult(NID_APP, __pContextMgr != null, E_INVALID_STATE, "pContextMgr should not be null!");
@@ -96,31 +89,15 @@ _AppManagerService::TerminateApplication(const AppId& appId)
        return _Aul::TerminateApplication(appId);
 }
 
-bool
-_AppManagerService::IsRunning(const AppId& appId)
-{
-       SysTryReturnResult(NID_APP, appId.IsEmpty()==false, E_INVALID_ARG, "The appId is empty.")
-       SysTryReturnResult(NID_APP, appId.GetLength() < WIDGET_APP_MAX_APPID_LENGTH, E_INVALID_ARG, "The appId is too long (Maximum %d bytes).", WIDGET_APP_MAX_APPID_LENGTH)
-
-       return _Aul::IsRunning(appId);
-}
-
-result
-_AppManagerService::GetRunningAppList(Tizen::Base::Collection::ArrayList* pArray)
-{
-       SysTryReturnResult(NID_APP, __pContextMgr != null, E_INVALID_STATE, "pContextMgr should not be null!");
-
-       return __pContextMgr->GetAppListN(pArray);
-}
 
 result
-_AppManagerService::RegisterApplication(const AppId& appId, const String& executableName, _AppType appType, int pid)
+_AppManagerService::RegisterApplication(const AppId& appId, _AppType appType, int pid)
 {
-       return RegisterApplication(appId, executableName, appType, pid, -1);
+       return RegisterApplication(appId, appType, pid, -1);
 }
 
 result
-_AppManagerService::RegisterApplication(const PackageId& packageId, const String& executableName, _AppType appType, int pid, int clientId)
+_AppManagerService::RegisterApplication(const AppId& appId, _AppType appType, int pid, int clientId)
 {
        if (_AppInfo::GetProcessId() == pid)
        {
@@ -128,13 +105,12 @@ _AppManagerService::RegisterApplication(const PackageId& packageId, const String
        }
        else
        {
-               SysLog(NID_APP, "Sending event for %ls.%ls(%d).", packageId.GetPointer(), executableName.GetPointer(), pid);
+               SysLog(NID_APP, "Sending event for %ls(%d).", appId.GetPointer(), pid);
 
-               _AppManagerEventArg arg(packageId, appType, _AppManagerEvent::_APP_MANAGER_EVENT_LAUNCHED);
+               _AppManagerEventArg arg(appId, appType, _AppManagerEvent::_APP_MANAGER_EVENT_LAUNCHED);
                SendEventToAllListeners(arg);
        }
 
-       const String appId = packageId + L'.' + executableName;
        SysTryReturnResult(NID_APP, __pContextMgr != null, E_INVALID_STATE, "pContextMgr should not be null!");
        return __pContextMgr->Register(appId, appType, pid, clientId, true);
 }

diff --git a/src/FApp_AppManagerStub.cpp b/src/FApp_AppManagerStub.cpp
old mode 100755 (executable)
new mode 100644 (file)
index f7f7785..9d09625
--- a/src/FApp_AppManagerStub.cpp
+++ b/src/FApp_AppManagerStub.cpp
@@ -162,19 +162,6 @@ _AppManagerStub::OnAppLifecycleEventReceived(int clientId, const AppId& appId, _
 /////////////////////////////////////////////
 
 bool
-_AppManagerStub::OnLaunchApplication(const AppId& appId, int req)
-{
-       SysTryCatch(NID_APP, __pAppManagerService != null, , E_INVALID_STATE, "__pAppManagerService is null!");
-
-       SysLog(NID_APP, "app(%ls)", appId.GetPointer());
-
-       __pAppManagerService->LaunchApplication(appId, req);
-
-CATCH:
-       return true;
-}
-
-bool
 _AppManagerStub::OnTerminateApplication(const AppId& appId, result *pRes)
 {
        SysTryCatch(NID_APP, __pAppManagerService != null, *pRes = E_INVALID_STATE, E_INVALID_STATE, "__pAppManagerService is null!");
@@ -197,36 +184,14 @@ CATCH:
        return true;
 }
 
-bool
-_AppManagerStub::OnIsRunning(const AppId& appId, bool *pRes)
-{
-       SysTryCatch(NID_APP, __pAppManagerService != null, *pRes = false, E_INVALID_STATE, "__pAppManagerService is null!");
-
-       *pRes = __pAppManagerService->IsRunning(appId);
-
-CATCH:
-       return true;
-}
-
-bool
-_AppManagerStub::OnGetRunningAppList(Tizen::Base::Collection::ArrayList* pArray, result *pRes)
-{
-       SysTryReturn(NID_APP, pArray != null, E_INVALID_ARG, E_INVALID_ARG, "pArray shoud not be null!");
-       SysTryCatch(NID_APP, __pAppManagerService != null, *pRes = E_INVALID_STATE, E_INVALID_STATE, "__pAppManagerService is null!");
-
-       *pRes = __pAppManagerService->GetRunningAppList(pArray);
-
-CATCH:
-       return true;
-}
 
 bool
-_AppManagerStub::OnRegisterApplication(const PackageId& packageId, const String& executableName, int appType, int pid)
+_AppManagerStub::OnRegisterApplication(const AppId& appId, int appType, int pid)
 {
        SysTryCatch(NID_APP, __pAppManagerService != null, , E_INVALID_STATE, "__pAppManagerService is null!");
-       SysLog(NID_APP, "_AppManagerStub::RegisterApplication package(%ls), pid(%d)\n", packageId.GetPointer(), pid);
+       SysLog(NID_APP, "_AppManagerStub::RegisterApplication app(%ls), pid(%d)\n", appId.GetPointer(), pid);
 
-       __pAppManagerService->RegisterApplication(packageId, executableName, static_cast<_AppType>(appType), pid, __pIpcServer->GetClientId());
+       __pAppManagerService->RegisterApplication(appId, static_cast<_AppType>(appType), pid, __pIpcServer->GetClientId());
 
 CATCH:
        return true;
@@ -268,10 +233,7 @@ _AppManagerStub::OnIpcRequestReceived(_IpcServer& server, const IPC::Message& me
        SysLog(NID_APP, "app(%ls), clientId(%d)\n", server.GetClientApplicationId().GetPointer(), server.GetClientId());
 
        IPC_BEGIN_MESSAGE_MAP(_AppManagerStub, message)
-               IPC_MESSAGE_HANDLER_EX(AppManager_LaunchApplication, &server, OnLaunchApplication)
                IPC_MESSAGE_HANDLER_EX(AppManager_TerminateApplication, &server, OnTerminateApplication)
-               IPC_MESSAGE_HANDLER_EX(AppManager_IsRunning, &server, OnIsRunning)
-               IPC_MESSAGE_HANDLER_EX(AppManager_GetRunningAppList, &server, OnGetRunningAppList)
                IPC_MESSAGE_HANDLER_EX(AppManager_RegisterApplication, &server, OnRegisterApplication)
                IPC_MESSAGE_HANDLER_EX(AppManager_UnregisterApplication, &server, OnUnregisterApplication)
                IPC_MESSAGE_HANDLER_EX(AppManager_AddEventListener, &server, OnAddEventListener)