From 81b0d15ef6edae9882f6316ff63520ecdb60f9c3 Mon Sep 17 00:00:00 2001 From: Young Ik Cho Date: Fri, 10 May 2013 16:32:55 +0900 Subject: [PATCH] fix AppControl E_MAX_EXCEEDED result Change-Id: I755e644c7feb5d28b7781f5943771badb744257e Signed-off-by: Young Ik Cho --- src/app/FApp_AppControlImpl.cpp | 10 ++++------ src/app/FApp_AppControlManager.cpp | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp index 6c0ba57..a170124 100755 --- a/src/app/FApp_AppControlImpl.cpp +++ b/src/app/FApp_AppControlImpl.cpp @@ -644,11 +644,10 @@ _AppControlImpl::StartNative(const IList* pDataList, IAppControlEventListener* p // after acquring request number, pLib should be managed from the list, not CATCH if (IsFailed(r)) { - SetLastResult(E_SYSTEM); _AppControlManager::GetInstance()->__inAppManager.RemoveItem(req); - SysLog(NID_APP, "[E_SYSTEM] A system error has occurred with %s.", GetErrorMessage(r)); + SysLog(NID_APP, "[%s] A system error has occurred.", GetErrorMessage(r)); - return E_SYSTEM; + return r; } _reqId = req; @@ -733,11 +732,10 @@ _AppControlImpl::StartNative(const String* pUriData, const String* pMimeType, co // after acquring request number, pLib should be managed from the list, not CATCH if (IsFailed(r)) { - SetLastResult(E_SYSTEM); _AppControlManager::GetInstance()->__inAppManager.RemoveItem(req); - SysLog(NID_APP, "[E_SYSTEM] A system error has occurred with %s.", GetErrorMessage(r)); + SysLog(NID_APP, "[%s] A system error has occurred.", GetErrorMessage(r)); - return E_SYSTEM; + return r; } _reqId = req; diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp index 2928230..302cbc5 100755 --- a/src/app/FApp_AppControlManager.cpp +++ b/src/app/FApp_AppControlManager.cpp @@ -442,11 +442,14 @@ _AppControlManager::LaunchPkg(_AppMessageImpl& msg, const char* pkg_name, const case APPSVC_RET_EILLACC: r = E_ILLEGAL_ACCESS; break; + case APPSVC_RET_EINVAL: + r = E_MAX_EXCEEDED; + break; default: r = E_SYSTEM; break; } - SysLog(NID_APP, "[%s]Launching service %s failure", GetErrorMessage(r), pkg_name); + SysLog(NID_APP, "[%s] Launching service %s failure", GetErrorMessage(r), pkg_name); } return r; @@ -493,6 +496,9 @@ _AppControlManager::Launch(_AppMessageImpl& msg, const char* pkg_name, const cha case APPSVC_RET_EILLACC: r = E_ILLEGAL_ACCESS; break; + case APPSVC_RET_EINVAL: + r = E_MAX_EXCEEDED; + break; default: r = E_SYSTEM; break; @@ -599,6 +605,11 @@ _AppControlManager::LaunchApp(const AppId& appId, _AppArg* pArg, int req) SysLog(NID_APP, "Submode launch successful"); return E_SUCCESS; } + else if (pid == APPSVC_RET_EINVAL) + { + SysLog(NID_APP, "Argument overflow"); + return E_MAX_EXCEEDED; + } pArg->UpdateAppId(actualAppId); @@ -615,6 +626,12 @@ _AppControlManager::LaunchApp(const AppId& appId, _AppArg* pArg, int req) SysLog(NID_APP, "Application(%d) launched with reqId(%d) and arg(0x%x).", pid, req, pArg); return E_SUCCESS; } + else if (pid == APPSVC_RET_EINVAL) + { + SysLog(NID_APP, "Argument overflow"); + return E_MAX_EXCEEDED; + } + count++; SysLog(NID_APP, "Waiting %dth time.", count); Thread::Sleep(TRY_SLEEP_TIME); @@ -627,6 +644,9 @@ _AppControlManager::LaunchApp(const AppId& appId, _AppArg* pArg, int req) case APPSVC_RET_EILLACC: r = E_ILLEGAL_ACCESS; break; + case APPSVC_RET_EINVAL: + r = E_MAX_EXCEEDED; + break; default: r = E_SYSTEM; break; @@ -732,6 +752,11 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v SysLog(NID_APP, "Submode launch successful"); return pid; } + else if (pid == APPSVC_RET_EINVAL) + { + SetLastResult(E_MAX_EXCEEDED); + return pid; + } } pArg->UpdateAppId(actualAppId); @@ -749,6 +774,12 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v SysLog(NID_APP, "Application(%d) launched with reqId(%d) and arg(0x%x).", pid, req, pArg); return pid; } + else if (pid == APPSVC_RET_EINVAL) + { + SetLastResult(E_MAX_EXCEEDED); + return pid; + } + count++; SysLog(NID_APP, "Waiting %dth time with %d.", count, pid); Thread::Sleep(TRY_SLEEP_TIME); @@ -761,6 +792,9 @@ _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, v case APPSVC_RET_EILLACC: r = E_ILLEGAL_ACCESS; break; + case APPSVC_RET_EINVAL: + r = E_MAX_EXCEEDED; + break; default: r = E_SYSTEM; break; -- 2.7.4