From c0c42bae08f91be459186eb8e395273b43fc64b0 Mon Sep 17 00:00:00 2001 From: "jungmin76.park" Date: Thu, 18 Apr 2013 18:55:45 +0900 Subject: [PATCH] minor fix Change-Id: I6c982742b9b218b2d748f5deb7e53fad6dc84e76 Signed-off-by: jungmin76.park --- LICENSE => LICENSE.Flora | 4 +- inc/FShell_AppWidgetContext.h | 2 +- src/FShell_AppWidgetContext.cpp | 46 ++++----- src/FShell_AppWidgetContextBase.cpp | 48 ++++----- src/FShell_AppWidgetManagerService.cpp | 176 ++++++++++++++++----------------- src/FShell_AppWidgetManagerStub.cpp | 50 +++++----- src/FShell_AppWidgetPopupContext.cpp | 14 +-- 7 files changed, 170 insertions(+), 170 deletions(-) rename LICENSE => LICENSE.Flora (98%) diff --git a/LICENSE b/LICENSE.Flora similarity index 98% rename from LICENSE rename to LICENSE.Flora index 9c95663..c7e2bea 100755 --- a/LICENSE +++ b/LICENSE.Flora @@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. "Tizen Certified Platform" shall mean a software platform that complies -with the standards set forth in the Compatibility Definition Document -and passes the Compatibility Test Suite as defined from time to time +with the standards set forth in the Tizen Compliance Specification +and passes the Tizen Compliance Tests as defined from time to time by the Tizen Technical Steering Group and certified by the Tizen Association or its designated agent. diff --git a/inc/FShell_AppWidgetContext.h b/inc/FShell_AppWidgetContext.h index b4d289f..558f42d 100644 --- a/inc/FShell_AppWidgetContext.h +++ b/inc/FShell_AppWidgetContext.h @@ -94,7 +94,7 @@ private: private: _AppWidgetPopupContext* __pAppWidgetPopup; // Tizen::Base::Runtime::Timer __lifeDurationTimer; - Tizen::Base::Runtime::Timer __UpdateTimer; + Tizen::Base::Runtime::Timer __updateTimer; int __updateMillis; Tizen::Base::Collection::ArrayListT* __pPendingTouchEventList; }; diff --git a/src/FShell_AppWidgetContext.cpp b/src/FShell_AppWidgetContext.cpp index 7edccc5..fb218ec 100644 --- a/src/FShell_AppWidgetContext.cpp +++ b/src/FShell_AppWidgetContext.cpp @@ -70,11 +70,11 @@ _AppWidgetContext::_AppWidgetContext(const String& info, const String& providerI // __lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC ); __updateMillis = (__updateMillis > UPDATE_PERIOD_MSEC_MIN) ? __updateMillis : UPDATE_PERIOD_MSEC_MIN; - SysLog(NID_APP, "period(%d)", __updateMillis); + SysLog(NID_SHELL, "period(%d)", __updateMillis); if( __updateMillis > 0) { - __UpdateTimer.Construct(*this);//, false); - __UpdateTimer.StartAsRepeatable(__updateMillis); + __updateTimer.Construct(*this);//, false); + __updateTimer.StartAsRepeatable(__updateMillis); } __pPendingTouchEventList = new ArrayListT(); @@ -83,13 +83,13 @@ _AppWidgetContext::_AppWidgetContext(const String& info, const String& providerI _AppWidgetContext::~_AppWidgetContext() { - SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); + SysLog(NID_SHELL, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); // __lifeDurationTimer.Cancel(); - __UpdateTimer.Cancel(); + __updateTimer.Cancel(); if (__pAppWidgetPopup) { - SysLog(NID_APP, "Destroying dangling AppWidgetPopup instance.."); + SysLog(NID_SHELL, "Destroying dangling AppWidgetPopup instance.."); __pAppWidgetPopup->OnPopupDestoyed(); delete __pAppWidgetPopup; } @@ -129,7 +129,7 @@ _AppWidgetContext::OnRemoved() void _AppWidgetContext::OnUpdate(const String& argument) { - SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); + SysLog(NID_SHELL, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); SendUpdateRequest(__width, __height, argument); } @@ -137,7 +137,7 @@ _AppWidgetContext::OnUpdate(const String& argument) void _AppWidgetContext::OnResize(int width, int height) { - SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); + SysLog(NID_SHELL, "appId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); __width = width; __height = height; @@ -147,19 +147,19 @@ _AppWidgetContext::OnResize(int width, int height) void _AppWidgetContext::OnForeground() { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); __isForeground = true; - __UpdateTimer.Cancel(); - __UpdateTimer.StartAsRepeatable(__updateMillis); + __updateTimer.Cancel(); + __updateTimer.StartAsRepeatable(__updateMillis); } void _AppWidgetContext::OnBackground() { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); __isForeground = false; - __UpdateTimer.Cancel(); + __updateTimer.Cancel(); } void @@ -175,7 +175,7 @@ _AppWidgetContext::OnPopupCreated(double x, double y, int width, int height) void _AppWidgetContext::OnPopupDestoyed(void) { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); if (__pAppWidgetPopup) { __pAppWidgetPopup->OnPopupDestoyed(); @@ -238,12 +238,12 @@ _AppWidgetContext::SendTouchEvent(buffer_event eventType, double timeStamp, doub if( HasValidClientId() && IsRunning() ) { SysAssert(IsSharedMemCreated() == true); - SysLog(NID_APP, "send IPC message"); + SysLog(NID_SHELL, "send IPC message"); AppWidgetManagerService::GetInstance()->SendTouchEvent(__ipcClientId, __instanceId, eventType, timeStamp, x, y); } else { - SysLog(NID_APP, "request to start AppControl"); + SysLog(NID_SHELL, "request to start AppControl"); __pPendingTouchEventList->Add(new PendingTouchEvent(eventType, timeStamp, x, y)); // @@ -273,7 +273,7 @@ _AppWidgetContext::RequestUpdateRemote(int width, int height) { /*if( GetAppWidgetPopup() != null) { - SysLog(NID_APP, "AppWidgetPopup is appeared, so appWidget doesn't need to update"); + SysLog(NID_SHELL, "AppWidgetPopup is appeared, so appWidget doesn't need to update"); return E_SUCCESS; }*/ std::unique_ptr packageName(_StringConverter::CopyToCharArrayN(__providerId)); @@ -281,10 +281,10 @@ _AppWidgetContext::RequestUpdateRemote(int width, int height) std::unique_ptr content_info(_StringConverter::CopyToCharArrayN(__userInfo)); int ret = provider_send_updated(packageName.get(), id.get(), width, height, __priority, content_info.get(), null); - SysTryReturnResult(NID_APP, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_send_updated"); + SysTryReturnResult(NID_SHELL, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_send_updated"); SendPendingTouchEvent(); - SysLog(NID_APP, "Done"); + SysLog(NID_SHELL, "Done"); return E_SUCCESS; } @@ -293,7 +293,7 @@ _AppWidgetContext::RequestUpdateRemote(int width, int height) //{ // __lifeDurationTimer.Cancel(); // __lifeDurationTimer.Start(DEFAULT_LIFE_DURATION_MSEC); -// SysLog(NID_APP, "lifeDuration timer restarted (%d)msec", DEFAULT_LIFE_DURATION_MSEC); +// SysLog(NID_SHELL, "lifeDuration timer restarted (%d)msec", DEFAULT_LIFE_DURATION_MSEC); //} void @@ -301,16 +301,16 @@ _AppWidgetContext::OnTimerExpired(Tizen::Base::Runtime::Timer& timer) { // if( &timer == &__lifeDurationTimer) // { -// SysLog(NID_APP, "lifeDuration timer is expired, so terminating appWidget app(%ls)..", __providerId.GetPointer() ); +// SysLog(NID_SHELL, "lifeDuration timer is expired, so terminating appWidget app(%ls)..", __providerId.GetPointer() ); // //// ReleaseSharedMem(); // AppManager::GetInstance()->TerminateApplication(__appId); // // } // else - if( &timer == &__UpdateTimer) + if( &timer == &__updateTimer) { - SysLog(NID_APP, "update timer is expired for appWidget app(%ls)..", __providerId.GetPointer() ); + SysLog(NID_SHELL, "update timer is expired for appWidget app(%ls)..", __providerId.GetPointer() ); OnUpdate(L""); } } diff --git a/src/FShell_AppWidgetContextBase.cpp b/src/FShell_AppWidgetContextBase.cpp index 71333d6..2641c80 100644 --- a/src/FShell_AppWidgetContextBase.cpp +++ b/src/FShell_AppWidgetContextBase.cpp @@ -108,12 +108,12 @@ _AppWidgetContextBase::_AppWidgetContextBase(target_type type, const String& use { _AppWidgetManagerImpl::ExtractAppIdAndProviderName(providerId, __appId, __providerName); - SysLog(NID_APP, "appId(%ls), providerId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __appId.GetPointer(), __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); + SysLog(NID_SHELL, "appId(%ls), providerId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __appId.GetPointer(), __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); } _AppWidgetContextBase::~_AppWidgetContextBase() { - SysLog(NID_APP, "providerId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); + SysLog(NID_SHELL, "providerId(%ls), instanceId(%ls), width(%d), height(%d), priority(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height, __priority); ReleaseSharedMem(); } @@ -127,7 +127,7 @@ _AppWidgetContextBase::SetIpcClientId(int clientId) bool _AppWidgetContextBase::HasValidClientId(void) const { - SysLog(NID_APP, "%d", __ipcClientId); + SysLog(NID_SHELL, "%d", __ipcClientId); return (__ipcClientId > -1); } @@ -140,7 +140,7 @@ _AppWidgetContextBase::IsSharedMemCreated(void) const int _AppWidgetContextBase::GetSharedMemId(int w, int h) { - SysLog(NID_APP, "Enter"); + SysLog(NID_SHELL, "Enter"); bool isResized = (__buffer_info != null) && (__buffer_info->width != w || __buffer_info->height != h); if ( isResized ) @@ -154,18 +154,18 @@ _AppWidgetContextBase::GetSharedMemId(int w, int h) std::unique_ptr id(_StringConverter::CopyToCharArrayN(__instanceId)); __buffer_info = provider_buffer_acquire(__type, packageName.get(), id.get(), w, h, sizeof(int), AppWidgetHandleBufferEventCallback, this); - SysTryReturnResult(NID_APP, __buffer_info , -1, "[E_SYSTEM] failed to provider_buffer_acquire"); - SysLog(NID_APP, "provider_buffer_acquire successed"); + SysTryReturnResult(NID_SHELL, __buffer_info , -1, "[E_SYSTEM] failed to provider_buffer_acquire"); + SysLog(NID_SHELL, "provider_buffer_acquire successed"); __buffer = provider_buffer_ref(__buffer_info); - SysTryReturnResult(NID_APP, __buffer , -1, "[E_SYSTEM] failed to provider_buffer_ref"); - SysLog(NID_APP, "provider_buffer_ref successed"); + SysTryReturnResult(NID_SHELL, __buffer , -1, "[E_SYSTEM] failed to provider_buffer_ref"); + SysLog(NID_SHELL, "provider_buffer_ref successed"); } int bufferId = __buffer_info->fb->handle; __providerState = RUNNING; - SysLog(NID_APP, "(%d) Exit", bufferId); + SysLog(NID_SHELL, "(%d) Exit", bufferId); return bufferId; } @@ -185,7 +185,7 @@ _AppWidgetContextBase::IsRunning() const result _AppWidgetContextBase::ReleaseSharedMem() { - SysLog(NID_APP, "Enter"); + SysLog(NID_SHELL, "Enter"); int ret; @@ -193,19 +193,19 @@ _AppWidgetContextBase::ReleaseSharedMem() { ret = provider_buffer_unref(__buffer); __buffer = null; - SysTryReturnResult(NID_APP, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_buffer_unref"); - SysLog(NID_APP, "provider_buffer_unref successed"); + SysTryReturnResult(NID_SHELL, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_buffer_unref"); + SysLog(NID_SHELL, "provider_buffer_unref successed"); } if( __buffer_info) { ret = provider_buffer_release(__buffer_info); __buffer_info = null; - SysTryReturnResult(NID_APP, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_buffer_release"); - SysLog(NID_APP, "provider_buffer_release successed"); + SysTryReturnResult(NID_SHELL, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_buffer_release"); + SysLog(NID_SHELL, "provider_buffer_release successed"); } - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); return E_SUCCESS; } @@ -229,7 +229,7 @@ _AppWidgetContextBase::SendRequestToApp(const AppId& appId, const String& operat { if( __isForeground == false) { - SysLog(NID_APP, "appWidget isn't foreground, so, message skip"); + SysLog(NID_SHELL, "appWidget isn't foreground, so, message skip"); return E_SUCCESS; } @@ -239,7 +239,7 @@ _AppWidgetContextBase::SendRequestToApp(const AppId& appId, const String& operat result _AppWidgetRequestHelper::SendRequestToApp(const AppId& appId, const String& operation, HashMap* pArgs) { - SysLog(NID_APP, "appId(%ls), operation(%ls), arg count(%d)", appId.GetPointer(), operation.GetPointer(), pArgs->GetCount() ); + SysLog(NID_SHELL, "appId(%ls), operation(%ls), arg count(%d)", appId.GetPointer(), operation.GetPointer(), pArgs->GetCount() ); _AppMessageImpl msg; msg.AddData(OSP_K_APPCONTROL_INTERNAL_OPERATION, L"livebox"); @@ -260,10 +260,10 @@ _AppWidgetRequestHelper::SendRequestToApp(const AppId& appId, const String& oper static int AppWidgetHandleBufferEventCallback( struct livebox_buffer *info, enum buffer_event event, double timestamp, double x, double y, void* data) { - SysLog(NID_APP, "timestamp(%f), x(%f), y(%f)", timestamp, x, y); + SysLog(NID_SHELL, "timestamp(%f), x(%f), y(%f)", timestamp, x, y); Tizen::Shell::App::_AppWidgetContextBase *pAppWidgetBase = static_cast(data); - SysTryReturn(NID_APP, pAppWidgetBase != null, 0, E_SYSTEM, "[E_SYSTEM] retrieved pAppWidgetBase is null"); + SysTryReturn(NID_SHELL, pAppWidgetBase != null, 0, E_SYSTEM, "[E_SYSTEM] retrieved pAppWidgetBase is null"); // const char *pkgname = provider_buffer_pkgname(info); // const char *id = provider_buffer_id(info); @@ -271,23 +271,23 @@ static int AppWidgetHandleBufferEventCallback( struct livebox_buffer *info, enum if( event == BUFFER_EVENT_ENTER) { - SysLog(NID_APP, "BUFFER_EVENT_ENTER"); + SysLog(NID_SHELL, "BUFFER_EVENT_ENTER"); } else if( event == BUFFER_EVENT_LEAVE) { - SysLog(NID_APP, "BUFFER_EVENT_LEAVE"); + SysLog(NID_SHELL, "BUFFER_EVENT_LEAVE"); } else if( event == BUFFER_EVENT_DOWN) { - SysLog(NID_APP, "BUFFER_EVENT_DOWN"); + SysLog(NID_SHELL, "BUFFER_EVENT_DOWN"); } else if( event == BUFFER_EVENT_MOVE) { - SysLog(NID_APP, "BUFFER_EVENT_MOVE"); + SysLog(NID_SHELL, "BUFFER_EVENT_MOVE"); } else if( event == BUFFER_EVENT_UP) { - SysLog(NID_APP, "BUFFER_EVENT_UP"); + SysLog(NID_SHELL, "BUFFER_EVENT_UP"); } pAppWidgetBase->SendTouchEvent(event, timestamp, x, y); diff --git a/src/FShell_AppWidgetManagerService.cpp b/src/FShell_AppWidgetManagerService.cpp index e0d1409..80c62b7 100644 --- a/src/FShell_AppWidgetManagerService.cpp +++ b/src/FShell_AppWidgetManagerService.cpp @@ -72,11 +72,11 @@ AppWidgetManagerService::GetInstance(void) if( pSelf == null) { pSelf = new AppWidgetManagerService(); - SysTryReturn(NID_APP, pSelf != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); + SysTryReturn(NID_SHELL, pSelf != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); result r = pSelf->Construct(); SysAssertf(!IsFailed(r), "Failed to construct AppWidgetManagerService"); - SysLog(NID_APP, "AppWidgetManagerService is created."); + SysLog(NID_SHELL, "AppWidgetManagerService is created."); } return pSelf; } @@ -89,10 +89,10 @@ AppWidgetManagerService::Construct() _AppWidgetManagerStub::StartIpcServer(); result r = __handlerThread.Construct(THREAD_TYPE_EVENT_DRIVEN); - SysTryReturn(NID_APP, IsFailed(r) == false, false, r, "[%s] Event thread creation failure.", GetErrorMessage(r)); + SysTryReturn(NID_SHELL, IsFailed(r) == false, false, r, "[%s] Event thread creation failure.", GetErrorMessage(r)); r = __handlerThread.Start(); - SysTryReturn(NID_APP, IsFailed(r) == false, false, r, "[%s] Event thread Start failure.", GetErrorMessage(r)); + SysTryReturn(NID_SHELL, IsFailed(r) == false, false, r, "[%s] Event thread Start failure.", GetErrorMessage(r)); return InitializeMasterDaemonEventReceiver("osp-appwidget-service"); } @@ -104,13 +104,13 @@ AppWidgetManagerService::AppWidgetConnected(struct event_arg *arg, void* data) ret = provider_send_hello(); if (ret == 0) { - SysLog(NID_APP, "success to be connected with master daemon"); + SysLog(NID_SHELL, "success to be connected with master daemon"); AppWidgetManagerService::GetInstance()->StartPingTimer(); } else { - SysLog(NID_APP, "failed to provider_send_hello()"); + SysLog(NID_SHELL, "failed to provider_send_hello()"); } return ret; } @@ -118,7 +118,7 @@ AppWidgetManagerService::AppWidgetConnected(struct event_arg *arg, void* data) int AppWidgetManagerService::AppWidgetDisconnected(struct event_arg *arg, void* data) { - SysLog(NID_APP, "success to be disconnected with master daemon"); + SysLog(NID_SHELL, "success to be disconnected with master daemon"); // aul_terminate_pid(getpid()); return 0; } @@ -133,7 +133,7 @@ AppWidgetManagerService::StartPingTimer() void AppWidgetManagerService::OnTimerExpired(Timer& timer) { - SysLog(NID_APP, "provider_send_ping"); + SysLog(NID_SHELL, "provider_send_ping"); provider_send_ping(); } @@ -144,7 +144,7 @@ AppWidgetManagerService::Find(const String& appId, const String& instanceId) con { _AppWidgetContext* pAppWidgetContext = null; __appWidgetContextList.GetAt(i, pAppWidgetContext); -// SysLog(NID_APP, "%ls", pAppWidgetContext->__instanceId.GetPointer()); +// SysLog(NID_SHELL, "%ls", pAppWidgetContext->__instanceId.GetPointer()); if ( pAppWidgetContext->__instanceId == instanceId ) { @@ -162,14 +162,14 @@ AppWidgetManagerService::SetIpcClientIds(const Tizen::App::AppId& appId, int cli { _AppWidgetContext* pAppWidgetContext = null; __appWidgetContextList.GetAt(i, pAppWidgetContext); - SysLog(NID_APP, "%ls", pAppWidgetContext->__instanceId.GetPointer()); - SysLog(NID_APP, "%ls, %ls", pAppWidgetContext->__providerId.GetPointer(), appId.GetPointer()); + SysLog(NID_SHELL, "%ls", pAppWidgetContext->__instanceId.GetPointer()); + SysLog(NID_SHELL, "%ls, %ls", pAppWidgetContext->__providerId.GetPointer(), appId.GetPointer()); if ( pAppWidgetContext->__appId == appId ) { - SysLog(NID_APP,""); + SysLog(NID_SHELL,""); pAppWidgetContext->SetIpcClientId(clientId); - SysLog(NID_APP, "client is registered.(%d)", clientId); + SysLog(NID_SHELL, "client is registered.(%d)", clientId); if( clientId == -1)//disconnected { @@ -189,7 +189,7 @@ void AppWidgetManagerService::OnIpcClientConnected(const _IpcServer& server, int clientId) { String appId = server.GetClientApplicationId(); - SysLog(NID_APP, "(%ls)\n", appId.GetPointer()); + SysLog(NID_SHELL, "(%ls)\n", appId.GetPointer()); this->SetIpcClientIds(appId, clientId); } @@ -198,7 +198,7 @@ void AppWidgetManagerService::OnIpcClientDisconnected(const _IpcServer& server, int clientId) { String appId = server.GetClientApplicationId(); - SysLog(NID_APP, "(%ls)\n", appId.GetPointer()); + SysLog(NID_SHELL, "(%ls)\n", appId.GetPointer()); this->SetIpcClientIds(appId, -1); } @@ -206,7 +206,7 @@ AppWidgetManagerService::OnIpcClientDisconnected(const _IpcServer& server, int c result AppWidgetManagerService::AddAppWidget(_AppWidgetContext* pAppWidgetContext) { - SysLog(NID_APP, "%ls, %ls, count(%d)", pAppWidgetContext->__providerId.GetPointer(), pAppWidgetContext->__instanceId.GetPointer(), __appWidgetContextList.GetCount()); + SysLog(NID_SHELL, "%ls, %ls, count(%d)", pAppWidgetContext->__providerId.GetPointer(), pAppWidgetContext->__instanceId.GetPointer(), __appWidgetContextList.GetCount()); return __appWidgetContextList.Add(pAppWidgetContext); } @@ -214,19 +214,19 @@ AppWidgetManagerService::AddAppWidget(_AppWidgetContext* pAppWidgetContext) result AppWidgetManagerService::RemoveAppWidget(const char* pPackageName, const char* pId, bool free) { - SysLog(NID_APP, "%s, %s, count(%d)", pPackageName, pId, __appWidgetContextList.GetCount()); + SysLog(NID_SHELL, "%s, %s, count(%d)", pPackageName, pId, __appWidgetContextList.GetCount()); - SysTryReturn(NID_APP, ( pPackageName != null && pId != null), null, E_INVALID_ARG, "[E_INVALID_ARG]"); - SysLog(NID_APP, "%s, %s", pPackageName, pId); + SysTryReturn(NID_SHELL, ( pPackageName != null && pId != null), null, E_INVALID_ARG, "[E_INVALID_ARG]"); + SysLog(NID_SHELL, "%s, %s", pPackageName, pId); _AppWidgetContext* pAppWidgetContext = Find(pPackageName, pId); - SysTryReturn(NID_APP, pAppWidgetContext, null, E_OBJ_NOT_FOUND, "[E_OBJ_NOT_FOUND]"); + SysTryReturn(NID_SHELL, pAppWidgetContext, null, E_OBJ_NOT_FOUND, "[E_OBJ_NOT_FOUND]"); result r = __appWidgetContextList.Remove(pAppWidgetContext); if( __appWidgetContextList.GetCount() == 0 ) { - SysLog(NID_APP, "No running native appWidget app remains, terminating osp appWidget service..."); + SysLog(NID_SHELL, "No running native appWidget app remains, terminating osp appWidget service..."); Tizen::App::App::GetInstance()->Terminate(); } @@ -240,18 +240,18 @@ AppWidgetManagerService::RemoveAppWidget(const char* pPackageName, const char* p int AppWidgetManagerService::OnAppWidgetCreate(struct event_arg *arg, int *width, int *height, double *priority, void* data) { - SysTryReturn(NID_APP, arg != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); - SysTryReturn(NID_APP, arg->pkgname != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); - SysTryReturn(NID_APP, arg->id != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); - SysTryReturn(NID_APP, arg->type == event_arg::EVENT_NEW, -EPERM, E_SUCCESS, "invalid argument from master"); + SysTryReturn(NID_SHELL, arg != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); + SysTryReturn(NID_SHELL, arg->pkgname != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); + SysTryReturn(NID_SHELL, arg->id != null, EINVAL, E_INVALID_ARG, "[E_INVALID_ARG]"); + SysTryReturn(NID_SHELL, arg->type == event_arg::EVENT_NEW, -EPERM, E_SUCCESS, "invalid argument from master"); - SysLog(NID_APP, "packageName(%s) id(%s) content(%s) cluster(%s) category(%s)", arg->pkgname, arg->id, arg->info.lb_create.content, arg->info.lb_create.cluster, arg->info.lb_create.category); - SysTryReturn (NID_APP, AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id) == null, -EBUSY, E_SUCCESS,"already exist"); + SysLog(NID_SHELL, "packageName(%s) id(%s) content(%s) cluster(%s) category(%s)", arg->pkgname, arg->id, arg->info.lb_create.content, arg->info.lb_create.cluster, arg->info.lb_create.category); + SysTryReturn (NID_SHELL, AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id) == null, -EBUSY, E_SUCCESS,"already exist"); double default_priority = 1.0f; _AppWidgetContext* pAppWidgetContext = new (std::nothrow)_AppWidgetContext( arg->info.lb_create.content, arg->pkgname, arg->id, arg->info.lb_create.width, arg->info.lb_create.height, arg->info.lb_create.period * 1000, default_priority); - SysTryReturn(NID_APP, pAppWidgetContext, 0, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); + SysTryReturn(NID_SHELL, pAppWidgetContext, 0, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); AppWidgetManagerService* pAppWidgetService = AppWidgetManagerService::GetInstance(); pAppWidgetService->AddAppWidget(pAppWidgetContext); @@ -261,7 +261,7 @@ AppWidgetManagerService::OnAppWidgetCreate(struct event_arg *arg, int *width, in *height= pAppWidgetContext->__height; *width = pAppWidgetContext->__width; - SysLog(NID_APP, "Exit. %d appWidget(es)", pAppWidgetService->__appWidgetContextList.GetCount()); + SysLog(NID_SHELL, "Exit. %d appWidget(es)", pAppWidgetService->__appWidgetContextList.GetCount()); return 0; } @@ -270,13 +270,13 @@ AppWidgetManagerService::OnAppWidgetUpdate(struct event_arg *arg, void* data) { if( arg->id == null || strlen(arg->id) < 1) { - SysLog(NID_APP, "updating alls"); + SysLog(NID_SHELL, "updating alls"); AppWidgetManagerService::GetInstance()->UpdateAllAppWidgetsByAppId(arg->pkgname); } else { _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnUpdate(L""); } @@ -303,30 +303,30 @@ AppWidgetManagerService::UpdateAllAppWidgetsByAppId(const String& providerId) int AppWidgetManagerService::OnAppWidgetDestroy(struct event_arg *arg, void* data) { - SysTryReturn (NID_APP, arg->type == event_arg::EVENT_DELETE, -EPERM, E_SUCCESS, "invalid argument from master"); - SysLog(NID_APP, "Enter"); + SysTryReturn (NID_SHELL, arg->type == event_arg::EVENT_DELETE, -EPERM, E_SUCCESS, "invalid argument from master"); + SysLog(NID_SHELL, "Enter"); AppWidgetManagerService* pAppWidgetManagerService = AppWidgetManagerService::GetInstance(); _AppWidgetContext* pAppWidgetContext = pAppWidgetManagerService->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnRemoved(); pAppWidgetManagerService->RemoveAppWidget( arg->pkgname, arg->id, true); delete pAppWidgetContext; - SysLog(NID_APP, "Exit"); + SysLog(NID_SHELL, "Exit"); return 0; } int AppWidgetManagerService::OnAppWidgetPopupCreate(struct event_arg *arg, void* data) { - SysTryReturn (NID_APP, arg->type == event_arg::EVENT_PD_CREATE, -EPERM, E_SUCCESS, "invalid argument from master"); - SysLog(NID_APP, "packageName(%s), id(%s), x(%d), y(%d), width(%f), height(%f), priority(%d)", arg->pkgname, arg->id, arg->info.pd_create.x, arg->info.pd_create.y, arg->info.pd_create.w, arg->info.pd_create.h); + SysTryReturn (NID_SHELL, arg->type == event_arg::EVENT_PD_CREATE, -EPERM, E_SUCCESS, "invalid argument from master"); + SysLog(NID_SHELL, "packageName(%s), id(%s), x(%d), y(%d), width(%f), height(%f), priority(%d)", arg->pkgname, arg->id, arg->info.pd_create.x, arg->info.pd_create.y, arg->info.pd_create.w, arg->info.pd_create.h); _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); /*if( pAppWidgetContext->GetAppWidgetPopup() ) { @@ -340,10 +340,10 @@ AppWidgetManagerService::OnAppWidgetPopupCreate(struct event_arg *arg, void* dat int AppWidgetManagerService::OnAppWidgetPopupDestroy(struct event_arg *arg, void* data) { - SysTryReturn (NID_APP, arg->type == event_arg::EVENT_PD_DESTROY, -EPERM, E_SUCCESS, "invalid argument from master"); - SysLog(NID_APP, "packageName(%s), id(%s)", arg->pkgname, arg->id); + SysTryReturn (NID_SHELL, arg->type == event_arg::EVENT_PD_DESTROY, -EPERM, E_SUCCESS, "invalid argument from master"); + SysLog(NID_SHELL, "packageName(%s), id(%s)", arg->pkgname, arg->id); _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnPopupDestoyed(); @@ -353,12 +353,12 @@ AppWidgetManagerService::OnAppWidgetPopupCreate(struct event_arg *arg, void* dat int AppWidgetManagerService::OnAppWidgetPause(struct event_arg *arg, void* data) { - SysTryReturn(NID_APP, arg, 0, E_SUCCESS, "arg is null!"); + SysTryReturn(NID_SHELL, arg, 0, E_SUCCESS, "arg is null!"); _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , 0, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , 0, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); - SysLog(NID_APP, "packageName(%s), id(%s)", arg->pkgname, arg->id); + SysLog(NID_SHELL, "packageName(%s), id(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnBackground(); return 0; } @@ -366,12 +366,12 @@ AppWidgetManagerService::OnAppWidgetPopupCreate(struct event_arg *arg, void* dat int AppWidgetManagerService::OnAppWidgetResume(struct event_arg *arg, void* data) { - SysTryReturn(NID_APP, arg || arg->id || arg->pkgname, 0, E_SUCCESS, "arg is null!"); + SysTryReturn(NID_SHELL, arg || arg->id || arg->pkgname, 0, E_SUCCESS, "arg is null!"); _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); - SysLog(NID_APP, "packageName(%s), id(%s)", arg->pkgname, arg->id); + SysLog(NID_SHELL, "packageName(%s), id(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnForeground(); return 0; } @@ -379,9 +379,9 @@ AppWidgetManagerService::OnAppWidgetResume(struct event_arg *arg, void* data) int AppWidgetManagerService::OnAppWidgetClick(struct event_arg *arg, void* data) { - SysTryReturn (NID_APP, arg->type == event_arg::EVENT_CLICKED, -EPERM, E_SUCCESS, "invalid argument from master"); - SysTryReturn(NID_APP, arg != null, -EPERM, E_SUCCESS, "arg is null!"); - SysLog(NID_APP, "packageName(%s), id(%s), clicked.event(%s), clicked.x(%d), clicked.y(%d)", arg->pkgname, arg->id, arg->info.clicked.event, arg->info.clicked.x, arg->info.clicked.y); + SysTryReturn (NID_SHELL, arg->type == event_arg::EVENT_CLICKED, -EPERM, E_SUCCESS, "invalid argument from master"); + SysTryReturn(NID_SHELL, arg != null, -EPERM, E_SUCCESS, "arg is null!"); + SysLog(NID_SHELL, "packageName(%s), id(%s), clicked.event(%s), clicked.x(%d), clicked.y(%d)", arg->pkgname, arg->id, arg->info.clicked.event, arg->info.clicked.x, arg->info.clicked.y); return 0; } @@ -389,13 +389,13 @@ AppWidgetManagerService::OnAppWidgetClick(struct event_arg *arg, void* data) int AppWidgetManagerService::OnAppWidgetResize(struct event_arg *arg, void* data) { - SysTryReturn(NID_APP, arg || arg->id || arg->pkgname, 0, E_SUCCESS, "arg is null!"); - SysTryReturn (NID_APP, arg->type == event_arg::EVENT_RESIZE, -EPERM, E_SUCCESS, "invalid argument from master"); + SysTryReturn(NID_SHELL, arg || arg->id || arg->pkgname, 0, E_SUCCESS, "arg is null!"); + SysTryReturn (NID_SHELL, arg->type == event_arg::EVENT_RESIZE, -EPERM, E_SUCCESS, "invalid argument from master"); - SysLog(NID_APP, "packageName(%s), id(%s), resize.w(%d), resize.h(%d)", arg->pkgname, arg->id, arg->info.resize.w, arg->info.resize.h); + SysLog(NID_SHELL, "packageName(%s), id(%s), resize.w(%d), resize.h(%d)", arg->pkgname, arg->id, arg->info.resize.w, arg->info.resize.h); _AppWidgetContext* pAppWidgetContext = AppWidgetManagerService::GetInstance()->Find(arg->pkgname, arg->id); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for appId(%s), instanceId(%s)", arg->pkgname, arg->id); pAppWidgetContext->OnResize(arg->info.resize.w, arg->info.resize.h); @@ -405,16 +405,16 @@ AppWidgetManagerService::OnAppWidgetResize(struct event_arg *arg, void* data) int AppWidgetManagerService::OnAppWidgetPeriodChaned(struct event_arg *arg, void* data) { - SysTryReturn(NID_APP, arg != null, 0, E_SUCCESS, "arg is null!"); - SysLog(NID_APP, "packageName(%s), id(%s), width(%d), height(%d), priority(%d)", arg->pkgname, arg->id); + SysTryReturn(NID_SHELL, arg != null, 0, E_SUCCESS, "arg is null!"); + SysLog(NID_SHELL, "packageName(%s), id(%s), width(%d), height(%d), priority(%d)", arg->pkgname, arg->id); return 0; } result AppWidgetManagerService::InitializeMasterDaemonEventReceiver(const char *pServiceExecutableName) { - SysTryReturnResult(NID_APP, pServiceExecutableName != null, E_INVALID_ARG, ""); - SysLog(NID_APP, "Enter."); + SysTryReturnResult(NID_SHELL, pServiceExecutableName != null, E_INVALID_ARG, ""); + SysLog(NID_SHELL, "Enter."); __appWidgetContextList.Construct(); @@ -444,18 +444,18 @@ AppWidgetManagerService::InitializeMasterDaemonEventReceiver(const char *pServic //cbs.change_group = OnAppWidgetGroupChanged; int ret = provider_init(null, pServiceExecutableName, &cbs, this); - SysTryReturnResult(NID_APP, ret == 0, E_SYSTEM, "provider_init failed."); + SysTryReturnResult(NID_SHELL, ret == 0, E_SYSTEM, "provider_init failed."); - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); return E_SUCCESS; } result AppWidgetManagerService::DeinitializeMasterDaemonEventReceiver() { - SysLog(NID_APP, "Enter."); + SysLog(NID_SHELL, "Enter."); provider_fini(); - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); return E_SUCCESS; } @@ -466,7 +466,7 @@ AppWidgetManagerService::DeinitializeMasterDaemonEventReceiver() result AppWidgetManagerService::RequestUpdate(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& argument) { - SysLog(NID_APP, "%ls, %ls", appId.GetPointer(), providerName.GetPointer() ); + SysLog(NID_SHELL, "%ls, %ls", appId.GetPointer(), providerName.GetPointer() ); bool found = false; for( int i = 0; i < __appWidgetContextList.GetCount(); i++ ) @@ -476,22 +476,22 @@ AppWidgetManagerService::RequestUpdate(const Tizen::App::AppId& appId, const Tiz if ( pAppWidgetContext->__appId == appId && pAppWidgetContext->__providerName == providerName) { - SysLog(NID_APP, "OK"); + SysLog(NID_SHELL, "OK"); ArrayList* pArray = new (std::nothrow) ArrayList(); - SysTryReturnResult(NID_APP, pArray, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); + SysTryReturnResult(NID_SHELL, pArray, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); pArray->Construct(); pArray->Add(pAppWidgetContext); pArray->Add(new String(argument)); result r = __handlerThread.SendUserEvent(LOCAL_EVENT_REQUEST_UPDATE, pArray); - SysTryLog(NID_APP, !IsFailed(r), "[%s] Propagated.", GetErrorMessage(r)); + SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Propagated.", GetErrorMessage(r)); found = true; } } - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); return (found) ? E_SUCCESS : E_OBJ_NOT_FOUND; } @@ -499,7 +499,7 @@ AppWidgetManagerService::RequestUpdate(const Tizen::App::AppId& appId, const Tiz result AppWidgetManagerService::RequestUpdateInstance(const Tizen::Base::String& instanceId, const Tizen::Base::String& argument) { - SysLog(NID_APP, "%ls, %ls", instanceId.GetPointer(), argument.GetPointer() ); + SysLog(NID_SHELL, "%ls, %ls", instanceId.GetPointer(), argument.GetPointer() ); for( int i = 0; i < __appWidgetContextList.GetCount(); i++ ) { @@ -508,22 +508,22 @@ AppWidgetManagerService::RequestUpdateInstance(const Tizen::Base::String& instan if ( pAppWidgetContext->__instanceId == instanceId) { - SysLog(NID_APP, "OK"); + SysLog(NID_SHELL, "OK"); ArrayList* pArray = new (std::nothrow) ArrayList(); - SysTryReturnResult(NID_APP, pArray, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); + SysTryReturnResult(NID_SHELL, pArray, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]"); pArray->Construct(); pArray->Add(pAppWidgetContext); pArray->Add(new String(argument)); result r = __handlerThread.SendUserEvent(LOCAL_EVENT_REQUEST_UPDATE, pArray); - SysTryLog(NID_APP, !IsFailed(r), "[%s] Propagated.", GetErrorMessage(r)); + SysTryLog(NID_SHELL, !IsFailed(r), "[%s] Propagated.", GetErrorMessage(r)); return E_SUCCESS; } } - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); return E_OBJ_NOT_FOUND; } @@ -531,7 +531,7 @@ result AppWidgetManagerService::RequestSharedMemoryId(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId, int width, int height, int& shmId) { _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); // if(pAppWidgetContext->HasValidClientId() == false) // { @@ -540,7 +540,7 @@ AppWidgetManagerService::RequestSharedMemoryId(const Tizen::App::AppId& appId, c // } shmId = pAppWidgetContext->GetSharedMemId(width, height); - SysTryReturnResult(NID_APP, pAppWidgetContext , shmId != -1, "[E_SYSTEM] failed to GetSharedMemId for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , shmId != -1, "[E_SYSTEM] failed to GetSharedMemId for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); return E_SUCCESS; } @@ -549,10 +549,10 @@ result AppWidgetManagerService::RequestSharedMemoryIdForPD(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId, int width, int height, int& shmId) { _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); _AppWidgetPopupContext* pPd = pAppWidgetContext->GetAppWidgetPopup(); - SysTryReturnResult(NID_APP, pPd , E_SYSTEM, "[E_SYSTEM] pPd is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pPd , E_SYSTEM, "[E_SYSTEM] pPd is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); if(pPd->HasValidClientId() == false) { @@ -561,7 +561,7 @@ AppWidgetManagerService::RequestSharedMemoryIdForPD(const Tizen::App::AppId& app } shmId = pPd->GetSharedMemId(width, height); - SysTryReturnResult(NID_APP, pAppWidgetContext , shmId != -1, "[E_SYSTEM] failed to GetSharedMemId for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , shmId != -1, "[E_SYSTEM] failed to GetSharedMemId for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); return E_SUCCESS; } @@ -570,7 +570,7 @@ result AppWidgetManagerService::RequestSyncSharedMemory(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId, int width, int height) { _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); return pAppWidgetContext->RequestUpdateRemote(width, height); } @@ -579,8 +579,8 @@ result AppWidgetManagerService::RequestSyncSharedMemoryForPD(const Tizen::App::AppId& appId, const Tizen::Base::String& instanceId) { _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); - SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); - SysTryReturnResult(NID_APP, pAppWidgetContext->GetAppWidgetPopup(), E_SYSTEM, "[E_SYSTEM] GetAppWidgetPopup() returns null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); + SysTryReturnResult(NID_SHELL, pAppWidgetContext->GetAppWidgetPopup(), E_SYSTEM, "[E_SYSTEM] GetAppWidgetPopup() returns null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); return pAppWidgetContext->GetAppWidgetPopup()->RequestUpdateRemote(); } @@ -592,7 +592,7 @@ AppWidgetManagerService::RequestReleaseSharedMemory(const Tizen::App::AppId& app // std::unique_ptr id(_StringConverter::CopyToCharArrayN(instanceId)); // // _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); -// SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); +// SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); // // return pAppWidgetContext->ReleaseSharedMem(); return E_SUCCESS; @@ -605,8 +605,8 @@ AppWidgetManagerService::RequestReleaseSharedMemoryForPD(const Tizen::App::AppId // std::unique_ptr id(_StringConverter::CopyToCharArrayN(instanceId)); // // _AppWidgetContext* pAppWidgetContext = this->Find(appId, instanceId); -// SysTryReturnResult(NID_APP, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); -// SysTryReturnResult(NID_APP, pAppWidgetContext->GetAppWidgetPopup(), E_SYSTEM, "[E_SYSTEM] GetAppWidgetPopup() returns null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); +// SysTryReturnResult(NID_SHELL, pAppWidgetContext , E_SYSTEM, "[E_SYSTEM] pAppWidgetContext is null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); +// SysTryReturnResult(NID_SHELL, pAppWidgetContext->GetAppWidgetPopup(), E_SYSTEM, "[E_SYSTEM] GetAppWidgetPopup() returns null for (%ls) (%ls)", appId.GetPointer(), instanceId.GetPointer()); // // return pAppWidgetContext->GetAppWidgetPopup()->ReleaseSharedMem(); return E_SUCCESS; @@ -620,19 +620,19 @@ AppWidgetManagerService::_TaskHandlerThread::~_TaskHandlerThread(void) void AppWidgetManagerService::_TaskHandlerThread::OnUserEventReceivedN(RequestId reqId, IList* pArgs) { - SysTryReturnVoidResult(NID_APP, pArgs != null, E_INVALID_STATE, "pArgs is null!."); + SysTryReturnVoidResult(NID_SHELL, pArgs != null, E_INVALID_STATE, "pArgs is null!."); - SysLog(NID_APP, "Enter."); + SysLog(NID_SHELL, "Enter."); switch (reqId) { case LOCAL_EVENT_REQUEST_UPDATE: { _AppWidgetContext* pAppWidgetContext = dynamic_cast<_AppWidgetContext*>( pArgs->GetAt(0) ); - SysTryReturnVoidResult(NID_APP, pAppWidgetContext != null, E_INVALID_STATE, "_AppWidget is null!."); + SysTryReturnVoidResult(NID_SHELL, pAppWidgetContext != null, E_INVALID_STATE, "_AppWidget is null!."); String* pArgument = dynamic_cast( pArgs->GetAt(1) ); - SysTryReturnVoidResult(NID_APP, pArgument != null, E_INVALID_STATE, "pArgument is null!."); + SysTryReturnVoidResult(NID_SHELL, pArgument != null, E_INVALID_STATE, "pArgument is null!."); pAppWidgetContext->OnUpdate(*pArgument); @@ -646,7 +646,7 @@ AppWidgetManagerService::_TaskHandlerThread::OnUserEventReceivedN(RequestId reqI SysAssertf(false, "never get here!"); break; } - SysLog(NID_APP, "Exit."); + SysLog(NID_SHELL, "Exit."); } } } } //namespace Tizen { namespace Shell { namespace App { diff --git a/src/FShell_AppWidgetManagerStub.cpp b/src/FShell_AppWidgetManagerStub.cpp index af9c27e..b8dddc3 100644 --- a/src/FShell_AppWidgetManagerStub.cpp +++ b/src/FShell_AppWidgetManagerStub.cpp @@ -45,14 +45,14 @@ using namespace Tizen::Security; _AppWidgetManagerStub::_AppWidgetManagerStub(void) :__pIpcServer(null) { - SysLog(NID_APP, "Enter\n"); + SysLog(NID_SHELL, "Enter\n"); - SysLog(NID_APP, "Exit\n"); + SysLog(NID_SHELL, "Exit\n"); } _AppWidgetManagerStub::~_AppWidgetManagerStub(void) { - SysLog(NID_APP, "Enter\n"); + SysLog(NID_SHELL, "Enter\n"); if ( __pIpcServer != null) { @@ -60,19 +60,19 @@ _AppWidgetManagerStub::~_AppWidgetManagerStub(void) delete __pIpcServer; } - SysLog(NID_APP, "Exit\n"); + SysLog(NID_SHELL, "Exit\n"); } result _AppWidgetManagerStub::StartIpcServer(void) { - SysLog(NID_APP, "Enter."); + SysLog(NID_SHELL, "Enter."); __pIpcServer = new (std::nothrow) _IpcServer(); - SysTryReturn(NID_APP, __pIpcServer != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Not enough memory."); + SysTryReturn(NID_SHELL, __pIpcServer != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Not enough memory."); result r = __pIpcServer->Construct( IPC_SERVER_NAME, *this, false); - SysTryCatch(NID_APP, !IsFailed(r), , r, "[%s] Failed to create IPC server(%s)", GetErrorMessage(r), "osp.app.ipcserver.appmanager"); - SysLog(NID_APP, "Exit."); + SysTryCatch(NID_SHELL, !IsFailed(r), , r, "[%s] Failed to create IPC server(%s)", GetErrorMessage(r), "osp.app.ipcserver.appmanager"); + SysLog(NID_SHELL, "Exit."); return E_SUCCESS; @@ -92,7 +92,7 @@ CATCH: bool _AppWidgetManagerStub::OnRequestUpdate(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& argument, result* pRes) { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); *pRes = RequestUpdate(appId, providerName, argument); return true; } @@ -100,7 +100,7 @@ _AppWidgetManagerStub::OnRequestUpdate(const Tizen::App::AppId& appId, const Tiz bool _AppWidgetManagerStub::OnRequestUpdateInstance(const Tizen::Base::String& instanceId, const Tizen::Base::String& argument, result* pRes) { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); *pRes = RequestUpdateInstance(instanceId, argument); return true; } @@ -108,7 +108,7 @@ _AppWidgetManagerStub::OnRequestUpdateInstance(const Tizen::Base::String& instan bool _AppWidgetManagerStub::OnRequestSharedMemoryId(const String& instanceId, int w, int h, int* pShmId) { - SysLog(NID_APP, "(instanceId:%d)xxx", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%d)xxx", instanceId.GetPointer()); RequestSharedMemoryId(__pIpcServer->GetClientAppId(), instanceId, w, h, *pShmId); @@ -118,7 +118,7 @@ _AppWidgetManagerStub::OnRequestSharedMemoryId(const String& instanceId, int w, bool _AppWidgetManagerStub::OnRequestSharedMemoryIdForPD(const String& instanceId, int w, int h, int* pShmId) { - SysLog(NID_APP, "(instanceId:%d)", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%d)", instanceId.GetPointer()); RequestSharedMemoryIdForPD(__pIpcServer->GetClientAppId(), instanceId, w, h, *pShmId); @@ -128,7 +128,7 @@ _AppWidgetManagerStub::OnRequestSharedMemoryIdForPD(const String& instanceId, in bool _AppWidgetManagerStub::OnRequestSyncSharedMemory(const String& instanceId, int w, int h, result* pRes) { - SysLog(NID_APP, "(instanceId:%ls)", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%ls)", instanceId.GetPointer()); *pRes = RequestSyncSharedMemory(__pIpcServer->GetClientAppId(), instanceId, w, h); @@ -138,7 +138,7 @@ _AppWidgetManagerStub::OnRequestSyncSharedMemory(const String& instanceId, int w bool _AppWidgetManagerStub::OnRequestSyncSharedMemoryForPD(const String& instanceId, result* pRes) { - SysLog(NID_APP, "(instanceId:%ls)", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%ls)", instanceId.GetPointer()); *pRes = RequestSyncSharedMemoryForPD(__pIpcServer->GetClientAppId(), instanceId); @@ -148,7 +148,7 @@ _AppWidgetManagerStub::OnRequestSyncSharedMemoryForPD(const String& instanceId, bool _AppWidgetManagerStub::OnRequestReleaseSharedMemory(const String& instanceId, result* pRes) { - SysLog(NID_APP, "(instanceId:%ls)", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%ls)", instanceId.GetPointer()); *pRes = RequestReleaseSharedMemory(__pIpcServer->GetClientAppId(), instanceId); @@ -158,7 +158,7 @@ _AppWidgetManagerStub::OnRequestReleaseSharedMemory(const String& instanceId, re bool _AppWidgetManagerStub::OnRequestReleaseSharedMemoryForPD(const String& instanceId, result* pRes) { - SysLog(NID_APP, "(instanceId:%ls)", instanceId.GetPointer()); + SysLog(NID_SHELL, "(instanceId:%ls)", instanceId.GetPointer()); *pRes = RequestReleaseSharedMemoryForPD(__pIpcServer->GetClientAppId(), instanceId); @@ -168,18 +168,18 @@ _AppWidgetManagerStub::OnRequestReleaseSharedMemoryForPD(const String& instanceI bool _AppWidgetManagerStub::SendTouchEvent(const int clientId, const String& instanceId, int eventType, double timestamp, double x, double y) { - SysLog(NID_APP,""); + SysLog(NID_SHELL,""); result r = __pIpcServer->SendResponse(clientId, new AppWidgetManager_SendTouchEvent(instanceId, eventType, timestamp, x, y)); - SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagated.", GetErrorMessage(r)); + SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "[%s] Propagated.", GetErrorMessage(r)); return true; } bool _AppWidgetManagerStub::SendTouchEventForPD(const int clientId, const String& instanceId, int eventType, double timestamp, double x, double y) { - SysLog(NID_APP,""); + SysLog(NID_SHELL,""); result r = __pIpcServer->SendResponse(clientId, new AppWidgetManager_SendTouchEventForPD(instanceId, eventType, timestamp, x, y)); - SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagated.", GetErrorMessage(r)); + SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "[%s] Propagated.", GetErrorMessage(r)); return true; } @@ -188,7 +188,7 @@ _AppWidgetManagerStub::SendTouchEventForPD(const int clientId, const String& ins void _AppWidgetManagerStub::OnIpcRequestReceived(_IpcServer& server, const IPC::Message& message) { - SysLog(NID_APP, "(appId:%ls, clientId:%d)\n", server.GetClientApplicationId().GetPointer(), server.GetClientId()); + SysLog(NID_SHELL, "(appId:%ls, clientId:%d)\n", server.GetClientApplicationId().GetPointer(), server.GetClientId()); SysAssertf(__pIpcServer, "__pIpcServer is null!"); @@ -207,26 +207,26 @@ _AppWidgetManagerStub::OnIpcRequestReceived(_IpcServer& server, const IPC::Messa void _AppWidgetManagerStub::OnIpcServerStarted(const _IpcServer& server) { - SysLog(NID_APP, "\n"); + SysLog(NID_SHELL, "\n"); } void _AppWidgetManagerStub::OnIpcServerStopped(const _IpcServer& server) { - SysLog(NID_APP, "\n"); + SysLog(NID_SHELL, "\n"); } void _AppWidgetManagerStub::OnIpcClientConnected(const _IpcServer& server, int clientId) { - SysLog(NID_APP, "(clientId:%d)\n", clientId); + SysLog(NID_SHELL, "(clientId:%d)\n", clientId); } void _AppWidgetManagerStub::OnIpcClientDisconnected(const _IpcServer& server, int clientId) { - SysLog(NID_APP, "(appId:%ls, clientId:%d)\n", server.GetClientApplicationId().GetPointer(), clientId); + SysLog(NID_SHELL, "(appId:%ls, clientId:%d)\n", server.GetClientApplicationId().GetPointer(), clientId); } diff --git a/src/FShell_AppWidgetPopupContext.cpp b/src/FShell_AppWidgetPopupContext.cpp index 75d59ca..1b0bfd0 100644 --- a/src/FShell_AppWidgetPopupContext.cpp +++ b/src/FShell_AppWidgetPopupContext.cpp @@ -54,26 +54,26 @@ const String ARG_KEY_HEIGHT = L"_Height"; _AppWidgetPopupContext::_AppWidgetPopupContext(const String& info, const String& appId, const String& instanceId, int width, int height, int priority) :_AppWidgetContextBase(TYPE_PD, info, appId, instanceId, width, height, priority) { - SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height); + SysLog(NID_SHELL, "appId(%ls), instanceId(%ls), width(%d), height(%d)", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height); } _AppWidgetPopupContext::~_AppWidgetPopupContext() { - SysLog(NID_APP, "appId(%ls), instanceId(%ls), width(%d), height(%d))", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height); + SysLog(NID_SHELL, "appId(%ls), instanceId(%ls), width(%d), height(%d))", __providerId.GetPointer(), __instanceId.GetPointer(), __width, __height); } void _AppWidgetPopupContext::OnPopupCreated(double x, double y, int width, int height) { - SysLog(NID_APP, "width(%d), height(%d)", width, height); + SysLog(NID_SHELL, "width(%d), height(%d)", width, height); SendPopupCreateRequest(x, y, width, height); } void _AppWidgetPopupContext::OnPopupDestoyed() { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); SendPopupDestroyRequest(); } @@ -101,7 +101,7 @@ _AppWidgetPopupContext::SendPopupDestroyRequest() result _AppWidgetPopupContext::SendTouchEvent(buffer_event event, double timestamp, double x, double y) { - SysLog(NID_APP, ""); + SysLog(NID_SHELL, ""); /*if( HasValidClientId() == false ) { std::unique_ptr pArgs (new (std::nothrow) ArrayList); @@ -130,9 +130,9 @@ _AppWidgetPopupContext::RequestUpdateRemote() std::unique_ptr id(_StringConverter::CopyToCharArrayN(__instanceId)); int ret = provider_send_desc_updated(packageName.get(), id.get(), null); - SysTryReturnResult(NID_APP, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_send_updated"); + SysTryReturnResult(NID_SHELL, ret >= 0 , E_SYSTEM, "[E_SYSTEM] failed to provider_send_updated"); - SysLog(NID_APP, "Done"); + SysLog(NID_SHELL, "Done"); return E_SUCCESS; } -- 2.7.4