clear last result to fix GetLastResult() error [N_SE-46568]

Change-Id: Iff3bc89239ef0131a581e3d488ae518631703daa
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/src/FShellAppWidgetManager.cpp b/src/FShellAppWidgetManager.cpp
index 8f78960..fd6606b 100644 (file)
--- a/src/FShellAppWidgetManager.cpp
+++ b/src/FShellAppWidgetManager.cpp
@@ -79,7 +79,6 @@ AppWidgetManager*
 AppWidgetManager::GetInstance(void)
 {
        ClearLastResult();
-
        SysTryReturn(NID_SHELL, _AppWidgetManagerImpl::HasFeature(), null, E_UNSUPPORTED_OPERATION, "[E_UNSUPPORTED_OPERATION] This operation is not supported.");
 
        static pthread_once_t onceBlock = PTHREAD_ONCE_INIT;
@@ -115,6 +114,7 @@ AppWidgetManager::Construct(void)
 IList*
 AppWidgetManager::GetAppWidgetProviderInfoListN(void) const
 {
+       ClearLastResult();
        IList* pIList = __pAppWidgetManagerImpl->GetAppWidgetProviderInfoListN();
        SysTryReturn(NID_SHELL, pIList, null, E_SYSTEM, "[E_SYSTEM] Failed to get the provider information.");
 
@@ -129,6 +129,7 @@ AppWidgetManager::GetAppWidgetProviderInfoListN(void) const
 AppWidgetProviderInfo*
 AppWidgetManager::GetAppWidgetProviderInfoN(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName) const
 {
+       ClearLastResult();
        return __pAppWidgetManagerImpl->GetAppWidgetProviderInfoN(appId, providerName);
 }
 
@@ -139,6 +140,7 @@ AppWidgetManager::GetAppWidgetProviderInfoN(const Tizen::App::AppId& appId, cons
 AppWidgetProviderInfo*
 AppWidgetManager::GetDefaultAppWidgetProviderInfoN(const Tizen::App::PackageId& packageId) const
 {
+       ClearLastResult();
        return __pAppWidgetManagerImpl->GetDefaultAppWidgetProviderInfoN(packageId);
 }
 

diff --git a/src/FShell_AppWidgetManagerImpl.cpp b/src/FShell_AppWidgetManagerImpl.cpp
index 796a41a..7e7f44c 100644 (file)
--- a/src/FShell_AppWidgetManagerImpl.cpp
+++ b/src/FShell_AppWidgetManagerImpl.cpp
@@ -195,10 +195,7 @@ int AppWidgetRequestHandlerCallback(const char* providerId, const char* text, in
 result
 _AppWidgetManagerImpl::SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener)
 {
-//     int ret = shortcut_set_request_cb(AppWidgetRequestHandlerCallback, this );
-//     SysTryReturnResult(NID_SHELL, ret == 0, E_SYSTEM, "failed to shortcut_set_request_cb (%d)", ret);
        result r = _ShortcutManagerImpl::GetInstance()->SetAppWidgetRequestHandlerCallback(AppWidgetRequestHandlerCallback);
-
        __pAppWidgetRequestEventListener = pListener;
 
        return r;

diff --git a/src/FShell_AppWidgetProviderInfoImpl.cpp b/src/FShell_AppWidgetProviderInfoImpl.cpp
index 5e452cb..b63d00b 100644 (file)
--- a/src/FShell_AppWidgetProviderInfoImpl.cpp
+++ b/src/FShell_AppWidgetProviderInfoImpl.cpp
@@ -167,7 +167,7 @@ _AppWidgetProviderInfoImpl::IsValidSize(const AppId& appId, int w, int h)
 Tizen::Base::Collection::IList*
 _AppWidgetProviderInfoImpl::GetSizeInfoListN() const
 {
-       static const int MAX_SUPPORTED_SIZE_TYPE = 6;//TODO: check this value.
+       static const int MAX_SUPPORTED_SIZE_TYPE = NR_OF_SIZE_LIST;
 
        int supportedSizeCount = MAX_SUPPORTED_SIZE_TYPE;
        int widthArray[MAX_SUPPORTED_SIZE_TYPE];

diff --git a/src/core/FShellShortcutManager.cpp b/src/core/FShellShortcutManager.cpp
index 05d07f2..1de4d1a 100644 (file)
--- a/src/core/FShellShortcutManager.cpp
+++ b/src/core/FShellShortcutManager.cpp
@@ -73,6 +73,8 @@ ShortcutManager::DestroySingleton(void)
 ShortcutManager*
 ShortcutManager::GetInstance()
 {
+       ClearLastResult();
+
        static pthread_once_t onceBlock = PTHREAD_ONCE_INIT;
        if (__pTheInstance == null)
        {