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 (executable)
--- 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 (file)
--- 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: