From c2baf03e9ae50a4b887a52143d32c6f2b3c7c3fa Mon Sep 17 00:00:00 2001 From: "jungmin76.park" Date: Wed, 26 Jun 2013 14:19:07 +0900 Subject: [PATCH] fix return valid exception when ValidateApplicationAttribute is failed for SetAppWidget(Popup)ProviderFactory Change-Id: Ia2d8eca3bb62053f31b41487a5c44211eb7755a2 Signed-off-by: jungmin76.park --- src/FShell_AppWidgetProviderManagerImpl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FShell_AppWidgetProviderManagerImpl.cpp b/src/FShell_AppWidgetProviderManagerImpl.cpp index 9f61e3b..fdacfb1 100644 --- a/src/FShell_AppWidgetProviderManagerImpl.cpp +++ b/src/FShell_AppWidgetProviderManagerImpl.cpp @@ -144,12 +144,12 @@ _AppWidgetProviderManagerImpl::SetAppWidgetProviderFactory(IAppWidgetProviderFac result r = ValidateApplicationAttribute(); if (IsFailed(r)) { - SysLog(NID_SHELL, "The application's attribute does not meet the condition to provide AppWidget. 'LifeDuration' and 'UseUi' attribute should be specified in application manifest and it's not allowed that declaring 'AUTO_RESTART' attribute for AppWidget."); + SysLogException(NID_SHELL, E_INVALID_OPERATION, "The application's attribute does not meet the condition to provide AppWidget. 'LifeDuration' and 'UseUi' attribute should be specified in application manifest and it's not allowed that declaring 'AUTO_RESTART' attribute for AppWidget."); - r = SendResult(INVALID_INSTANCE, false); - SysTryLog(NID_SHELL, !IsFailed(r), "Because the context for this dynamic box is removed, POLLRDHUP occurs."); + r = SendResult(INVALID_INSTANCE, false); + SysTryLog(NID_SHELL, !IsFailed(r), "Because the context for this dynamic box is removed, POLLRDHUP occurs."); -// SysAssertf(false, "The application's attribute does not meet the condition to provide Dynamic Box."); + return E_INVALID_OPERATION; } SysLog(NID_SHELL, "enter"); @@ -164,12 +164,12 @@ _AppWidgetProviderManagerImpl::SetAppWidgetPopupProviderFactory(IAppWidgetPopupP result r = ValidateApplicationAttribute(); if (IsFailed(r)) { - SysLog(NID_SHELL, "The application's attribute does not meet the condition to provide AppWidget. 'LifeDuration' and 'UseUi' attribute should be specified in application manifest and it's not allowed that declaring 'AUTO_RESTART' attribute for AppWidget."); + SysLogException(NID_SHELL, E_INVALID_OPERATION, "The application's attribute does not meet the condition to provide AppWidget. 'LifeDuration' and 'UseUi' attribute should be specified in application manifest and it's not allowed that declaring 'AUTO_RESTART' attribute for AppWidget."); r = SendResult(INVALID_INSTANCE, false); SysTryLog(NID_SHELL, !IsFailed(r), "Because the context for this dynamic box is removed, POLLRDHUP occurs."); -// SysAssertf(false, "The application's attribute does not meet the condition to provide Dynamic Box."); + return E_INVALID_OPERATION; } __pAppWidgetPopupProviderFactory = &factory; -- 2.7.4