fix appcontrol result behavior from service callee

[platform/framework/native/appfw.git] / src / app / inc / FApp_AppArg.h

diff --git a/src/app/inc/FApp_AppArg.h b/src/app/inc/FApp_AppArg.h
index 32f59f0..f61782d 100644 (file)
--- a/src/app/inc/FApp_AppArg.h
+++ b/src/app/inc/FApp_AppArg.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -25,13 +24,13 @@
 #ifndef _FAPP_INTERNAL_APP_ARG_H_
 #define _FAPP_INTERNAL_APP_ARG_H_
 
-#include <bundle.h>
-
 #include <FBaseObject.h>
 #include <FAppTypes.h>
 
 #include "FApp_Types.h"
 
+typedef struct _bundle_t bundle;
+
 namespace Tizen { namespace Base { namespace Collection {
 class ArrayList;
 class IList;
@@ -68,11 +67,11 @@ enum _DataControlRequestType
 #define OSP_K_DATACONTROL_PROVIDER             "__OSP_DATACONTROL_PROVIDER__"
 #define OSP_K_DATACONTROL_DATA                 "__OSP_DATACONTROL_DATA__"
 #define OSP_K_DATACONTROL_REQUEST_TYPE  "__OSP_DATACONTROL_REQUEST_TYPE__"
+#define OSP_K_DATACONTROL_PROTOCOL_VERSION     "__OSP_DATACONTROL_PROTOCOL_VERSION__"
 
 /**
  * @class       _AppArg
  * @brief
- * @since 2.1
  */
 class _OSP_EXPORT_ _AppArg
 {
@@ -180,6 +179,14 @@ public:
 
        static void UpdateKeyValue(bundle* b, const char* pKey, const Tizen::Base::String& value);
 
+       static void UpdateSubMode(bundle* b);
+
+       static bool IsSubMode(bundle* b);
+
+       static void UpdateServiceApp(bundle* b);
+
+       static bool IsServiceApp(bundle* b);
+
        static result UpdateWindowHandle(bundle* b, long handle);
 
        static Tizen::Base::Collection::ArrayList* GetListN(bundle* b, const char* key);
@@ -189,7 +196,7 @@ public:
        static result FillMapFromList(Tizen::Base::Collection::IMap* pMap, const Tizen::Base::Collection::IList* pList);
 
        static result FillLegacyAppControlResult(Tizen::Base::Collection::IList& list, int res, const Tizen::Base::Collection::IMap* pMap, const Tizen::Base::String& aId);
-       
+
        static result SetArgMap(bundle* pBundle, Tizen::Base::Collection::HashMap* pMap);
 
 private:
@@ -197,7 +204,7 @@ private:
 
        _AppArg& operator =(const _AppArg& source);
 
-       static result CreateLaunchArg(bundle* b, const Tizen::Base::String& arg);
+       static result CreateNotificationArg(bundle* b, const Tizen::Base::String& arg);
 
        static result CreateLaunchArg(bundle* b, const Tizen::Base::Collection::IList* pList);