From: Sunwook Bae <sunwook45.bae@samsung.com>
Date: Tue, 21 May 2013 09:06:38 +0000 (+0900)
Subject: Merge "Resolve result cancel issue of DataControl provider." into tizen_2.1
X-Git-Tag: accepted/tizen/20130912.081851^2~307
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9c57c4826280c13d676831779831471fa0ad172;hp=3635d7c924ade9802d64139c8310c04d9ce6c904;p=platform%2Fframework%2Fnative%2Fappfw.git

Merge "Resolve result cancel issue of DataControl provider." into tizen_2.1
---

diff --git a/src/app/FApp_AppArg.cpp b/src/app/FApp_AppArg.cpp
index c35521e..0bb0123 100755
--- a/src/app/FApp_AppArg.cpp
+++ b/src/app/FApp_AppArg.cpp
@@ -1031,6 +1031,7 @@ _AppArg::CreateSqlDataControlArg(bundle* b, const _SqlDataControlImpl& dc, _Data
 	snprintf(dataControlRequestType, MAX_LEN_DATA_CONTROL_REQ_TYPE, "%d", static_cast<int>(requestType));
 	bundle_add(b, OSP_K_DATACONTROL_REQUEST_TYPE, dataControlRequestType);
 	bundle_add(b, OSP_K_DATACONTROL_PROTOCOL_VERSION, OSP_V_VERSION_2_1_0_3);
+	bundle_add(b, AUL_K_NO_CANCEL, "1");
 
 	std::unique_ptr<char[]> pProvider(_StringConverter::CopyToCharArrayN(dc.__providerId));
 	if (pProvider)
@@ -1056,6 +1057,7 @@ _AppArg::CreateMapDataControlArg(bundle* b, const _MapDataControlImpl& dc, _Data
 	snprintf(dataControlRequestType, MAX_LEN_DATA_CONTROL_REQ_TYPE, "%d", static_cast < int >(requestType));
 	bundle_add(b, OSP_K_DATACONTROL_REQUEST_TYPE, dataControlRequestType);
 	bundle_add(b, OSP_K_DATACONTROL_PROTOCOL_VERSION, OSP_V_VERSION_2_1_0_3);
+	bundle_add(b, AUL_K_NO_CANCEL, "1");
 
 	std::unique_ptr<char[]> pProvider(_StringConverter::CopyToCharArrayN(dc.__providerId));
 	if (pProvider)
diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp
index 7b187c4..71354b5 100644
--- a/src/app/FApp_AppImpl.cpp
+++ b/src/app/FApp_AppImpl.cpp
@@ -516,7 +516,7 @@ _AppImpl::HandleAppRequest(service_s* service, int req, _AppHandler handler)
 
 		OnDataControlRequestReceived(*pArg, static_cast< RequestId >(req));
 
-		_AppControlManager::GetInstance()->RemoveResultRequest(req);
+		//_AppControlManager::GetInstance()->RemoveResultRequest(req);
 		break;
 
 	case _APP_HANDLER_LAUNCH_COND: