fix appcontrol result behavior from service callee

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

diff --git a/src/app/inc/FApp_Aul.h b/src/app/inc/FApp_Aul.h
index 0d79ade..08133c2 100644 (file)
--- a/src/app/inc/FApp_Aul.h
+++ b/src/app/inc/FApp_Aul.h
@@ -23,10 +23,11 @@
 #define _FAPP_INTERNAL_AUL_H_
 
 #include <appsvc/appsvc.h>
-#include <bundle.h>
 #include <FOspConfig.h>
 #include <FAppTypes.h>
 
+typedef struct _bundle_t bundle;
+
 #define MAX_SLP_PACKAGE_ID 128
 
 namespace Tizen { namespace App
@@ -47,17 +48,13 @@ public:
 
        static result TerminateApplicationByPid(int pid);
 
-       static result SendResult(bundle* b, appsvc_result_val res);
-
-       static bool IsRunning(const AppId& appId, const Tizen::Base::String& exeName);
-
-       static bool IsRunning(const Tizen::Base::String& packageName);
+       static result SendResult(bundle* b, appsvc_result_val res, bool isSubMode, bool isServiceApp);
 
-       static void SetOnAppTerminatedCb(int (* pf_app_dead_handler)(int pid, void* pData), void* pData);
+       static bool IsRunning(const Tizen::Base::String& appId);
 
        static result SetOomAdj(int pid, int adj);
 
-       static result SetPowerOffNotiListener(void (*powerOffCb)(void *pData), void *pData);
+       static result SetPowerOffNotiListener(void (*powerOffCb)(void* node, void *pData), void *pData);
 
        static int GetAppType(const Tizen::Base::String& category);
 
@@ -66,54 +63,6 @@ public:
        _OSP_LOCAL_ static AppId GetRealAppId(const AppId& appId);
 
 public:
-       /**
-        * This is static helper class for desktop file.
-        */
-       class _DesktopFile
-       {
-       public:
-               /**
-                * Updates the service value
-                * @param[in]   appId                   The application's ID to be executed
-                * @param[in]   value                   value to be added or updated.
-                *
-                * @remark              If operations is new, it will be appended.
-                *              but, if same operation is already exist, 'url' and 'mimeType' will be updated.
-                */
-               static result UpdateService(const AppId& appId, const char* value);
-
-               /**
-                * Removes the service value by operation
-                * @param[in]   appId   The application's ID to be executed
-                * @param[in]   operationOnlyValue      operationId of service to be removed
-                */
-               static result RemoveService(const AppId& appId, const char* operationOnlyValue);
-
-       private:
-               /**
-                * Updates value of specified field
-                */
-               static result UpdateField(const char* path, const char* key, const char* value, bool isRemove = false);
-
-               /**
-                * Makes desktop file path from appId (retrives appName using _PackageMamagerImpl)
-                */
-               static result MakePath(const AppId& appId, char* path, int size);
-
-               /**
-                * Update service value of input buffer with specified value
-                */
-               static char* UpdateServiceValueN(char* buffer, const char* newValue, bool isRemove = false);
-
-               /**
-                * Extracts each informations from one service string.
-                */
-               static result ParseService(const Tizen::Base::String& service, Tizen::Base::String& operation, Tizen::Base::String& url, Tizen::Base::String& mimeType);
-
-               static void AppendServiceValueToString(Tizen::Base::String& string, const Tizen::Base::String& newVaue);
-
-               friend class UTs_Aul;
-       }; // _DesktopFile
 
        friend class UTs_Aul;
 }; // _Aul