From 6fbcd99b0a832a1b18dfa9b46e6c6ef03a8d285b Mon Sep 17 00:00:00 2001 From: Young Ik Cho Date: Wed, 29 May 2013 19:29:24 +0900 Subject: [PATCH] N_SE-39536 : raise window on appcontrol result callback Change-Id: I5571df2499767d2b95b7b606a2ee3bbce5896d76 Signed-off-by: Young Ik Cho --- src/app/FApp_AppArg.cpp | 7 ++--- src/app/FApp_AppControlImpl.cpp | 20 ++++++------- src/app/FApp_AppControlManager.cpp | 34 ++++++++++++++++++----- src/app/FApp_AppImpl.cpp | 17 +++++++----- src/app/FApp_AppRegistryImpl.cpp | 1 - src/app/FApp_ServiceAppImpl.cpp | 14 ++++++---- src/app/inc/FApp_AppControlManager.h | 5 ++++ src/app/inc/FApp_AppImpl.h | 54 +++--------------------------------- src/app/inc/FApp_IAppImpl.h | 16 ++--------- src/app/inc/FApp_ServiceAppImpl.h | 13 ++++----- src/app/inc/FApp_Types.h | 1 - 11 files changed, 71 insertions(+), 111 deletions(-) mode change 100755 => 100644 src/app/FApp_AppArg.cpp mode change 100755 => 100644 src/app/FApp_AppControlImpl.cpp mode change 100755 => 100644 src/app/FApp_AppControlManager.cpp mode change 100755 => 100644 src/app/inc/FApp_AppControlManager.h diff --git a/src/app/FApp_AppArg.cpp b/src/app/FApp_AppArg.cpp old mode 100755 new mode 100644 index 0bb0123..25a6f3c --- a/src/app/FApp_AppArg.cpp +++ b/src/app/FApp_AppArg.cpp @@ -328,6 +328,8 @@ _AppArg::GetArgMapN(void) const { SysTryReturn(NID_APP, __pBundle != null, null, E_INVALID_STATE, "[E_INVALID_STATE] Improper bundle state."); + //Print(); + HashMap* pHashMap = new (std::nothrow) HashMap(SingleObjectDeleter); SysTryReturn(NID_APP, pHashMap != null, null, E_OUT_OF_MEMORY, "HashMap creation failure."); @@ -341,11 +343,6 @@ _AppArg::GetArgMapN(void) const return null; } - ArrayList* pList = _AppMessageImpl::GetValueArrayN(__pBundle, OSP_K_ARG); - if (pList) - { - pHashMap->Add(new (std::nothrow) String(TIZEN_APPCONTROL_DATA_LEGACY), pList); - } return pHashMap; } diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp old mode 100755 new mode 100644 index f7fac9d..34f81ce --- a/src/app/FApp_AppControlImpl.cpp +++ b/src/app/FApp_AppControlImpl.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include @@ -39,7 +37,6 @@ #include "FApp_AppControlImpl.h" #include "FApp_AppControlManager.h" #include "FApp_AppArg.h" -#include "FApp_AppImpl.h" #include "FApp_AppControlRegistry.h" #include "FApp_AppMessageImpl.h" #include "FApp_AppInfo.h" @@ -66,8 +63,10 @@ static const int _REQ_ID_INVALID = -1; namespace Tizen { namespace App { +class IAppControlEventListener; +class IAppControlResponseListener; + const wchar_t TIZEN_OPERATION_MAIN[] = L"http://tizen.org/appcontrol/operation/main"; -const char TIZEN_APPCONTROL_DATA_LEGACY[] = "http://tizen.org/appcontrol/data/legacyresult"; _AppControlImpl::_AppControlImpl(const AppControl& value) : _appControl(value) @@ -476,7 +475,7 @@ _AppControlImpl::AppControlCbLegacy(void* data, _AppArg* pArg, _AppArg* pResArg, SysTryReturnResult(NID_APP, b != NULL, E_SYSTEM, "Invalid result bundle."); IAppControlEventListener* pListener = static_cast(data); - SysTryReturnResult(NID_APP, typeid(pListener) == typeid(IAppControlEventListener*), E_SYSTEM, "Invalid result callback"); + SysTryReturnResult(NID_APP, pListener == null || typeid(pListener) == typeid(IAppControlEventListener*), E_SYSTEM, "Invalid result callback"); bundle* inb = pArg->GetBundle(); SysTryReturnResult(NID_APP, inb != NULL, E_SYSTEM, "Empty caller bundle."); @@ -522,8 +521,7 @@ _AppControlImpl::AppControlCbLegacy(void* data, _AppArg* pArg, _AppArg* pResArg, ArrayList list(SingleObjectDeleter); _AppArg::FillLegacyAppControlResult(list, res, pMap.get(), provider); - // proper callback invokation - pListener->OnAppControlCompleted(provider, oId, &list); + _AppControlManager::InvokeLegacyAppControlCompleteListener(*pListener, provider, oId, &list); return E_SUCCESS; } @@ -541,7 +539,7 @@ _AppControlImpl::AppControlCb(void* data, _AppArg* pArg, _AppArg* pResArg, servi SysTryReturnResult(NID_APP, b != NULL, E_SYSTEM, "Invalid result bundle."); IAppControlResponseListener* pListener = static_cast(data); - SysTryReturnResult(NID_APP, typeid(pListener) == typeid(IAppControlResponseListener*), E_SYSTEM, "Invalid result callback"); + SysTryReturnResult(NID_APP, pListener == null || typeid(pListener) == typeid(IAppControlResponseListener*), E_SYSTEM, "Invalid result callback"); bundle* inb = pArg->GetBundle(); SysTryReturnResult(NID_APP, inb != NULL, E_SYSTEM, "Empty caller bundle."); @@ -600,8 +598,7 @@ _AppControlImpl::AppControlCb(void* data, _AppArg* pArg, _AppArg* pResArg, servi } else { - pListener->OnAppControlCompleteResponseReceived(provider, oId, ret, pMap.get()); - SysLog(NID_APP, "OnAppControlCompleteResponseReceived, Called"); + _AppControlManager::InvokeAppControlCompleteListener(*pListener, provider, oId, ret, pMap.get()); } return E_SUCCESS; @@ -977,8 +974,7 @@ _AppControlImpl::OnAppControlResponseEventReceivedN(const Tizen::Base::Runtime:: { if(pEventArg->GetType() == _APPCONTROL_RESPONSETYPE_COMPLETE) { - pResponseListener->OnAppControlCompleteResponseReceived(pEventArg->GetAppId(), pEventArg->GetOperationId(), pEventArg->GetAppControlResult(), pEventArg->GetExtraData()); - SysLog(NID_APP, "OnAppControlCompleteResponseReceived called"); + _AppControlManager::InvokeAppControlCompleteListener(*pResponseListener, pEventArg->GetAppId(), pEventArg->GetOperationId(), pEventArg->GetAppControlResult(), pEventArg->GetExtraData()); _AppControlResponseEvent* pResponseEvent = null; _AppControlManager::GetInstance()->GetAppControlResponseEventContainer()->GetValue(pEventArg->GetRequestId(), pResponseEvent); diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp old mode 100755 new mode 100644 index f6a51ee..1f7f742 --- a/src/app/FApp_AppControlManager.cpp +++ b/src/app/FApp_AppControlManager.cpp @@ -245,6 +245,27 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, const AppId& appId, co } +void +_AppControlManager::InvokeAppControlCompleteListener(IAppControlResponseListener& listener, const AppId& appId, const String& op, AppCtrlResult res, const IMap* pExtraData) +{ + listener.OnAppControlCompleteResponseReceived(appId, op, res, pExtraData); + + _AppImpl::GetInstance()->RaiseWindow(); + + SysLog(NID_APP, "AppControl response finished."); +} + + +void +_AppControlManager::InvokeLegacyAppControlCompleteListener(IAppControlEventListener& listener, const AppId& appId, const String& op, const IList* pList) +{ + listener.OnAppControlCompleted(appId, op, pList); + + _AppImpl::GetInstance()->RaiseWindow(); + SysLog(NID_APP, "Legacy AppControl response finished."); +} + + // callback for in-process event handling void _AppControlManager::OnAppControlEventReceivedN(int reqId, int res, const IMap* pArgs) @@ -284,7 +305,7 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, int res, const IMap* p ArrayList list(SingleObjectDeleter); _AppArg::FillLegacyAppControlResult(list, res, pArgs, aId); - pListener->OnAppControlCompleted(aId, oId, &list); + InvokeLegacyAppControlCompleteListener(*pListener, aId, oId, &list); } else { @@ -311,10 +332,9 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, int res, const IMap* p } else { - pListener->OnAppControlCompleteResponseReceived(aId, oId, ConvertAppControlResultCode(res), pArgs); - SysLog(NID_APP, "OnAppControlCompleteResponseReceived called directly"); - IMap* pMap = const_cast (pArgs); - delete pMap; + InvokeAppControlCompleteListener(*pListener, aId, oId, ConvertAppControlResultCode(res), pArgs); + SysLog(NID_APP, "Listener called directly"); + delete pArgs; } } else @@ -1003,8 +1023,8 @@ _AppControlManager::OnAppControlResponseEventReceivedN(const Tizen::Base::Runtim } else { - pResponseListener->OnAppControlCompleteResponseReceived(pEventArg->GetAppId(), pEventArg->GetOperationId(), pEventArg->GetAppControlResult(), pEventArg->GetExtraData()); - SysLog(NID_APP, "OnAppControlCompleteResponseReceived called"); + InvokeAppControlCompleteListener(*pResponseListener, pEventArg->GetAppId(), pEventArg->GetOperationId(), pEventArg->GetAppControlResult(), pEventArg->GetExtraData()); + SysLog(NID_APP, "Listener called"); _AppControlResponseEvent* pResponseEvent = null; _AppControlManager::GetInstance()->GetAppControlResponseEventContainer()->GetValue(pEventArg->GetRequestId(), pResponseEvent); diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp index 71354b5..346a974 100644 --- a/src/app/FApp_AppImpl.cpp +++ b/src/app/FApp_AppImpl.cpp @@ -176,7 +176,7 @@ _AppImpl::Execute(_IAppImpl* pIAppImpl) state_handler.low_memory = &OnLowMemory; state_handler.low_battery = NULL; state_handler.language_changed = &OnLanguageChanged; - state_handler.region_format_changed = &OnRegionFormatChanged; + state_handler.region_format_changed = NULL; _Aul::SetPowerOffNotiListener(OnPowerOffNotiReceived, this); // if (pAppManager != null) @@ -625,12 +625,6 @@ _AppImpl::OnLanguageChanged(void* user_data) SysLog(NID_APP, "Language change done."); } -void -_AppImpl::OnRegionFormatChanged(void* user_data) -{ - // Osp doesn't implement this callback. -} - result _AppImpl::SendUserEvent(RequestId requestId, const IList* pArgs) @@ -1242,6 +1236,15 @@ _AppImpl::GetWindowHandle(void) const void +_AppImpl::RaiseWindow(void) +{ + SysTryReturnVoidResult(NID_APP, __pIAppImpl != null, E_INVALID_STATE, "[E_INVALID_STATE] Getting App instance failed."); + + __pIAppImpl->OnFrameRaiseRequested(); +} + + +void _AppImpl::OnAppCheckpoint(void) { if (__pCheckpointEventListener) diff --git a/src/app/FApp_AppRegistryImpl.cpp b/src/app/FApp_AppRegistryImpl.cpp index 9d2ab4b..96db27e 100644 --- a/src/app/FApp_AppRegistryImpl.cpp +++ b/src/app/FApp_AppRegistryImpl.cpp @@ -28,7 +28,6 @@ using namespace Tizen::Io; using namespace Tizen::Base; -using namespace Tizen::Base::Collection; namespace Tizen { namespace App { diff --git a/src/app/FApp_ServiceAppImpl.cpp b/src/app/FApp_ServiceAppImpl.cpp index 899503e..567a2a3 100644 --- a/src/app/FApp_ServiceAppImpl.cpp +++ b/src/app/FApp_ServiceAppImpl.cpp @@ -188,19 +188,20 @@ _ServiceAppImpl::OnPause(void) } -void -_ServiceAppImpl::OnDeviceOrientationChanged(app_device_orientation_e orientation) +long +_ServiceAppImpl::OnWindowHandleRequest(void) { - SysLog(NID_APP, "System device orientation changed event on 0x%x state", _AppInfo::GetAppState()); + return -1; } -long -_ServiceAppImpl::OnWindowHandleRequest(void) +result +_ServiceAppImpl::OnFrameRaiseRequested(void) { - return -1; + return E_SUCCESS; } + _ServiceAppImpl* _ServiceAppImpl::GetInstance(void) { @@ -214,6 +215,7 @@ _ServiceAppImpl::GetServiceAppInstance(void) return __pServiceApp; } + bool _ServiceAppImpl::OnAppInitializing(void) { diff --git a/src/app/inc/FApp_AppControlManager.h b/src/app/inc/FApp_AppControlManager.h old mode 100755 new mode 100644 index 8761a35..2b2c254 --- a/src/app/inc/FApp_AppControlManager.h +++ b/src/app/inc/FApp_AppControlManager.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "FApp_Types.h" @@ -282,6 +283,10 @@ public: static AppCtrlResult ConvertAppControlResultCode(int res); + static void InvokeAppControlCompleteListener(IAppControlResponseListener& listener, const AppId& appId, const Tizen::Base::String& op, AppCtrlResult res, const Tizen::Base::Collection::IMap* pExtraData); + + static void InvokeLegacyAppControlCompleteListener(IAppControlEventListener& listener, const AppId& appId, const Tizen::Base::String& op, const Tizen::Base::Collection::IList* pList); + private: _OSP_LOCAL_ _AppControlManager(void); diff --git a/src/app/inc/FApp_AppImpl.h b/src/app/inc/FApp_AppImpl.h index f272132..7f26878 100644 --- a/src/app/inc/FApp_AppImpl.h +++ b/src/app/inc/FApp_AppImpl.h @@ -56,7 +56,6 @@ class _IAppImpl; /** * @class _AppImpl * @brief This class is the Impl class of a App class. - * @since 2.1 * * This class is the Impl class of a App class. */ @@ -71,7 +70,6 @@ public: /** * Initializes this instance of _AppImpl with the specified arguments * - * @since 2.1 * @return An error code * @param[in] pArgs A pointer to the list that contains the String instances of launch arguments * @exception E_SUCCESS The method is successful. @@ -84,7 +82,6 @@ public: * Executes an application implemented by inheriting App class. * This method must be called from the UiApp or ServiceApp. * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG A specified input parameter is invalid. @@ -97,7 +94,6 @@ public: /** * Returns the _AppImpl's instance pointer. * - * @since 2.1 * @return A pointer to the %_AppImpl instance, @n * else @c null if it fails */ @@ -106,7 +102,6 @@ public: /** * Returns the App's instance pointer. * - * @since 2.1 * @return A pointer to the %App instance, @n * else @c null if it fails */ @@ -115,7 +110,6 @@ public: /** * Returns the status of the termination request * - * @since 2.1 * @return @c true if the termination is requested, @n * else @c false */ @@ -124,7 +118,6 @@ public: /** * Called when the application is started * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false * @param[in] user_data The user data passed from the callback registration function @@ -135,7 +128,6 @@ public: /** * Called when other application send the launch request to the application * - * @since 2.1 * @param[in] service The handle to the service * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function @@ -145,7 +137,6 @@ public: /** * Called when the application is completely obscured by another application and becomes invisible * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -154,7 +145,6 @@ public: /** * Called when the application becomes visible * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -163,7 +153,6 @@ public: /** * Called once after the main loop of application exits * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -172,7 +161,6 @@ public: /** * Called when the system memory is running low * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -181,25 +169,14 @@ public: /** * Called when language setting changes * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ static void OnLanguageChanged(void* user_data); /** - * Called when region format setting changes - * - * @since 2.1 - * @param[in] user_data The user data passed from the callback registration function - * @remarks This is a system dependent callback function - */ - static void OnRegionFormatChanged(void* user_data); - - /** * Set Listener * - * @since 2.1 * @return An error code * @param[in] appEvent _AppEvent event type * @param[in] pListener Listener to set @@ -223,7 +200,6 @@ public: * After this method succeeds, the application's state changes to Tizen::App::AppState::RUNNING. * If the method fails, the application's state changes to Tizen::App::AppState::TERMINATING and call OnAppTerminating() subsequently. * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false */ @@ -231,15 +207,12 @@ public: /** * Called when a checkpoint event occurs - * - * @since 2.1 */ void OnAppCheckpoint(void); /** * Registers app request * - * @since 2.1 * @return An error code * @param[in] service service handle * @param[out] req request number @@ -250,11 +223,13 @@ public: /** * Gets the window handle if exists. - * - * @since 2.1 */ long GetWindowHandle(void) const; + /** + * Raises the window if possible + */ + void RaiseWindow(void); void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel); @@ -265,15 +240,11 @@ public: private: /** * This is the default constructor for this class. - * - * @since 2.1 */ _AppImpl(void); /** * This is the constructor for this class. - * - * @since 2.1 */ _AppImpl(App* pApp); @@ -289,15 +260,12 @@ private: /** * This is the destructor for this class. - * - * @since 2.1 */ virtual ~_AppImpl(void); /** * Gets the list of the launch arguments. @n * - * @since 2.1 * @return A pointer to the list that contains the String instances of launch arguments */ Tizen::Base::Collection::IList* GetAppArgumentListN(void) const; @@ -306,7 +274,6 @@ private: * Terminates the application while it is running. @n * The OnAppTerminating() method is called after this method is executed successfully. * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is successful. * @exception E_INVALID_STATE This instance is in an invalid state. @@ -318,7 +285,6 @@ private: * After this method succeeds, the application's state changes to Tizen::App::AppState::RUNNING. * If the method fails, the application's state changes to Tizen::App::AppState::TERMINATING and call OnAppTerminating() subsequently. * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false */ @@ -329,7 +295,6 @@ private: * Return @c false if you don't want your application to terminate. @n * If the method returns @c true, the application's state changes to Tizen::App::AppState::TERMINATING and call OnAppTerminating() subsequently. * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false */ @@ -338,7 +303,6 @@ private: /** * Sends the user event to the application itself and not to other application. * - * @since 2.1 * @return An error code * @param[in] requestId The user defined event ID * @param[in] pArgs A pointer to an argument list of type String @@ -350,7 +314,6 @@ private: * Called asynchronously when the user event is sent by the SendUserEvent() method. @n * The request ID and argument format for the user event can be defined as per the requirement. * - * @since 2.1 * @param[in] requestId The user defined event ID * @param[in] pArgs A pointer to an argument list of type String */ @@ -358,30 +321,24 @@ private: /** * Called asynchronously when AppControl provider event is received. - * - * @since 2.1 */ void OnAppControlRequestReceived(const _AppArg& arg, RequestId reqId); /** * Called asynchronously when DataControl provider event is received. * - * @since 2.1 * @param[in] arg The launch argument */ void OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId); /** * Called asynchronously when conditional app launch event is received. - * - * @since 2.1 */ void OnConditionRequestReceived(const _AppArg& arg, RequestId reqId); /** * Handles AppControl/DataControl request * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is succesful. */ @@ -390,7 +347,6 @@ private: /** * Handles legacy UserEvent request * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is succesful. */ @@ -399,7 +355,6 @@ private: /** * Dummy implementation for app event request * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is successful. */ @@ -408,7 +363,6 @@ private: /** * Set legacy app service handler * - * @since 2.1 * @return An error code * @exception E_SUCCESS The method is successful. */ diff --git a/src/app/inc/FApp_IAppImpl.h b/src/app/inc/FApp_IAppImpl.h index 83f6e49..8a37450 100644 --- a/src/app/inc/FApp_IAppImpl.h +++ b/src/app/inc/FApp_IAppImpl.h @@ -37,7 +37,6 @@ public: /** * Called when the application is started * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false * @param[in] user_data The user data passed from the callback registration function @@ -48,7 +47,6 @@ public: /** * Called when the application's state changes to INITIALIZING * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false */ @@ -57,7 +55,6 @@ public: /** * Called when the application's INITIALIZING state is finished * - * @since 2.1 * @return @c true if the method is successful, @n * else @c false */ @@ -66,7 +63,6 @@ public: /** * Called when other application send the launch request to the application * - * @since 2.1 * @param[in] service The handle to the service * @param[in] initial initial launch * @param[in] user_data The user data passed from the callback registration function @@ -77,7 +73,6 @@ public: /** * Called when the application is completely obscured by another application and becomes invisible * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -86,7 +81,6 @@ public: /** * Called when the application becomes visible * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ @@ -95,24 +89,18 @@ public: /** * Called once after the main loop of application exits * - * @since 2.1 * @param[in] user_data The user data passed from the callback registration function * @remarks This is a system dependent callback function */ virtual void OnTerminate(void) = 0; /** - * Called when an orintation event occurs. - * - * @since 2.1 - * @param[in] orientation The information about the orientation event + * Called when the window is requested to be raised */ - virtual void OnDeviceOrientationChanged(app_device_orientation_e orientation) = 0; + virtual result OnFrameRaiseRequested(void) = 0; /** * Called when the internal window handle is required. - * - * @since 2.1 */ virtual long OnWindowHandleRequest(void) = 0; }; diff --git a/src/app/inc/FApp_ServiceAppImpl.h b/src/app/inc/FApp_ServiceAppImpl.h index 0b55195..8982715 100644 --- a/src/app/inc/FApp_ServiceAppImpl.h +++ b/src/app/inc/FApp_ServiceAppImpl.h @@ -125,14 +125,6 @@ public: virtual void OnTerminate(void); /** - * Called when an orintation event occurs. - * - * @since 2.1 - * @param[in] orientation The information about the orientation event - */ - virtual void OnDeviceOrientationChanged(app_device_orientation_e orientation); - - /** * Called when the application's state changes to Tizen::App::AppState::INITIALIZING. @n * * @since 2.1 @@ -158,6 +150,11 @@ public: virtual long OnWindowHandleRequest(void); /** + * Called when the window is requested to be raised. + */ + virtual result OnFrameRaiseRequested(void); + + /** * Called when the application's state change to Tizen::App::AppState::TERMINATING. @n * * @since 2.1 diff --git a/src/app/inc/FApp_Types.h b/src/app/inc/FApp_Types.h index a7493ee..5d71f6b 100644 --- a/src/app/inc/FApp_Types.h +++ b/src/app/inc/FApp_Types.h @@ -105,7 +105,6 @@ _OSP_LOCAL_ extern const wchar_t LEGACY_LAUNCH_REASON_NORMAL[]; _OSP_LOCAL_ extern const wchar_t LEGACY_LAUNCH_REASON_CONDITIONAL[]; _OSP_LOCAL_ extern const wchar_t TIZEN_OPERATION_MAIN[]; _OSP_EXPORT_ extern const wchar_t TIZEN_OPERATION_PICK[]; -_OSP_LOCAL_ extern const char TIZEN_APPCONTROL_DATA_LEGACY[]; _OSP_LOCAL_ extern const char TIZEN_NOTIFICATION_DATA[]; } } // Tizen::App -- 2.7.4