fix AppControl E_MAX_EXCEEDED result

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

diff --git a/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp b/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
index 393167e..f0b599f 100644 (file)
--- a/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
+++ b/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
@@ -77,7 +77,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUri, pMime, OnAppControlResult, 0);
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Bluetooth AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Bluetooth AppControl is failed.");
        SysLog(NID_APP, "Launching Bluetooth AppControl succeeded.");
 
        __req = req;

diff --git a/src/calendar-app-control/CalendarAppControlDllEntry.cpp b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
index 1821da1..283c787 100644 (file)
--- a/src/calendar-app-control/CalendarAppControlDllEntry.cpp
+++ b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
@@ -240,7 +240,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        __req = req; 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, operation, pActualUri, pMime, pCb, 0);
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Calendar AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Calendar AppControl is failed.");
 
        SysLog(NID_APP, "StartAppControl: Launching Calendar AppControl succeeded");
 

diff --git a/src/camera-app-control/CameraAppControlDllEntry.cpp b/src/camera-app-control/CameraAppControlDllEntry.cpp
index 238d7da..b96d2e1 100644 (file)
--- a/src/camera-app-control/CameraAppControlDllEntry.cpp
+++ b/src/camera-app-control/CameraAppControlDllEntry.cpp
@@ -95,7 +95,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                __req = req;
                __processId = _AppControlManager::GetInstance()->Launch(msg, package, String(APPSVC_OPERATION_CREATE_CONTENT), pUri, pActualMime, OnAppControlResult, 0);
 
-               SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Camera AppControl is failed.");
+               r = GetLastResult();
+               SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Camera AppControl is failed.");
 
                r = E_SUCCESS;
                SysLog(NID_APP, "StartAppControl: Launching Camera AppControl succeeded");

diff --git a/src/contact-app-control/ContactAppControlDllEntry.cpp b/src/contact-app-control/ContactAppControlDllEntry.cpp
index 0f30fce..e13fe9d 100644 (file)
--- a/src/contact-app-control/ContactAppControlDllEntry.cpp
+++ b/src/contact-app-control/ContactAppControlDllEntry.cpp
@@ -541,7 +541,9 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        const String& package = _AppControlManager::GetAliasAppId(providerAppId);
 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, operation, pActualUri, pMime, pCb, 0);
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Contact AppControl is failed.");
+
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Contact AppControl is failed.");
        __req = req;
 
        r = E_SUCCESS;

diff --git a/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp b/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
index 17b65b5..0526e25 100644 (file)
--- a/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
+++ b/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
@@ -99,7 +99,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        __req = req;
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUriData, pActualMime, OnAppControlResult, 0);
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Image AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Image AppControl is failed.");
        r = E_SUCCESS;
 
        SysLog(NID_APP, "StartAppControl: Launching ImageViewer AppControl succeeded");

diff --git a/src/image-app-control/ImageAppControlDllEntry.cpp b/src/image-app-control/ImageAppControlDllEntry.cpp
index bfba4c6..1e93ce4 100644 (file)
--- a/src/image-app-control/ImageAppControlDllEntry.cpp
+++ b/src/image-app-control/ImageAppControlDllEntry.cpp
@@ -99,7 +99,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pActualUri, pMime, OnAppControlResult, 0);
        }
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Image AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Image AppControl is failed.");
        r = E_SUCCESS;
 
        SysLog(NID_APP, "StartAppControl: Launching ImageViewer AppControl succeeded");

diff --git a/src/media-app-control/MediaAppControlDllEntry.cpp b/src/media-app-control/MediaAppControlDllEntry.cpp
index 45ff112..0d767f4 100644 (file)
--- a/src/media-app-control/MediaAppControlDllEntry.cpp
+++ b/src/media-app-control/MediaAppControlDllEntry.cpp
@@ -104,7 +104,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pActualUri, pMime, NULL, 0);
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Image AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Image AppControl is failed.");
        r = E_SUCCESS;
 
        SysLog(NID_APP, "StartAppControl: Launching ImageViewer AppControl succeeded");

diff --git a/src/message-app-control/MessageAppControlDllEntry.cpp b/src/message-app-control/MessageAppControlDllEntry.cpp
index 50bab12..37aafc8 100644 (file)
--- a/src/message-app-control/MessageAppControlDllEntry.cpp
+++ b/src/message-app-control/MessageAppControlDllEntry.cpp
@@ -198,7 +198,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                __req = req;
                __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUri, pMime, OnAppControlResult, 0);
 
-               SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Email AppControl is failed.");
+               r = GetLastResult();
+               SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Email AppControl is failed.");
                SysLog(NID_APP, "StartAppControl: Launching Message AppControl succeeded.");
 
        }
@@ -273,7 +274,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                __req = req;
                __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUri, pMime, OnAppControlResult, 0);
 
-               SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Email AppControl is failed.");
+               r = GetLastResult();
+               SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Email AppControl is failed.");
                SysLog(NID_APP, "StartAppControl: Launching Email AppControl succeeded.");
        }
 

diff --git a/src/setting-app-control/SettingAppControlDllEntry.cpp b/src/setting-app-control/SettingAppControlDllEntry.cpp
index d898736..82a4c72 100644 (file)
--- a/src/setting-app-control/SettingAppControlDllEntry.cpp
+++ b/src/setting-app-control/SettingAppControlDllEntry.cpp
@@ -192,7 +192,8 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        __req = req;
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, operation, pUri, pMime, pCb, 0);
 
-       SysTryReturnResult(NID_APP, __processId >= 0, E_SYSTEM, "StartAppControl: Launching Camera AppControl is failed.");
+       r = GetLastResult();
+       SysTryReturnResult(NID_APP, __processId >= 0, r, "StartAppControl: Launching Camera AppControl is failed.");
 
        r = E_SUCCESS;
        SysLog(NID_APP, "StartAppControl: Launching Camera AppControl succeeded");