Seperate DeviceManagerService into System-service so.

[platform/framework/native/appfw.git] / src / system / FSys_DeviceManagerImpl.cpp

diff --git a/src/system/FSys_DeviceManagerImpl.cpp b/src/system/FSys_DeviceManagerImpl.cpp
index ff7ca7d..cf68558 100644 (file)
--- a/src/system/FSys_DeviceManagerImpl.cpp
+++ b/src/system/FSys_DeviceManagerImpl.cpp
@@ -42,6 +42,7 @@
 
 #include "FSys_CommunicationDispatcherClient.h"
 #include "FSys_DeviceManagerImpl.h"
+#include "FSys_DeviceManagerMsgClient.h"
 
 #define VCONFKEY_APPSERVICE_MMC_STATUS "memory/appservice/mmc"
 
@@ -56,7 +57,7 @@ using namespace Tizen::Io;
 namespace Tizen { namespace System
 {
 
-static const wchar_t* _DEVICE_MANAGER_SERVICE_ID = L"osp.devicemanager.service";
+static const wchar_t* _DEVICE_MANAGER_SERVICE_ID = L"osp.sys.ipcserver.devicemanager";
 static const wchar_t* _DEVICE_MANAGER_COMMAND_OPEN = L"osp.devicemanager.command.open";
 static const wchar_t* _DEVICE_MANAGER_COMMAND_CLOSE = L"osp.devicemanager.command.close";
 static const wchar_t* _DEVICE_MANAGER_COMMAND_STATUS = L"osp.devicemanager.command.status";
@@ -152,13 +153,11 @@ _DeviceManagerImpl::_DeviceManagerImpl()
        int ret = 0;
        static String DEVICE_MANAGER_SERVICE_ID(_DEVICE_MANAGER_SERVICE_ID);
 
-       _CommunicationDispatcherClient* pCommunicationDispatcherClient = _CommunicationDispatcherClient::GetInstance();
-       SysTryCatch(NID_SYS, pCommunicationDispatcherClient != null, r = E_SYSTEM, r, "It is failed to get CommunicationDispatcherClient.");
-
-       r = pCommunicationDispatcherClient->RegisterCommunicationListener(DEVICE_MANAGER_SERVICE_ID, *this);
-       SysTryCatch(NID_SYS, r == E_SUCCESS, r = E_SYSTEM, r, "It is failed to register on CommunicationDispatcherClient.");
-
-       __pIpcClient = pCommunicationDispatcherClient->GetIpcClient();
+       _DeviceManagerMsgClient* pDeviceManagerMsgClient = _DeviceManagerMsgClient::GetInstance();
+       SysTryCatch(NID_SYS, pDeviceManagerMsgClient != null, r = E_SYSTEM, r, "It is failed to get DeviceManagerMsgClient.");
+        r = pDeviceManagerMsgClient->RegisterListener(_DEVICE_MANAGER_SERVICE_ID,*this);
+       SysTryCatch(NID_SYS, r == E_SUCCESS, r = E_SYSTEM, r, "It is failed to register on DeviceManagerMsgClient.");
+        __pIpcClient =  pDeviceManagerMsgClient->GetIpcClient();
 
        ret = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED, OnDeviceStateChanged, null);
        SysTryCatch(NID_SYS, ret == RUNTIME_INFO_ERROR_NONE, r = E_SYSTEM, r, "It is failed to register USB event");
@@ -210,7 +209,7 @@ _DeviceManagerImpl::~_DeviceManagerImpl()
 {
        result r = E_SUCCESS;
        int ret = 0;
-       _CommunicationDispatcherClient* pCommunicationDispatcherClient = null;
+       _DeviceManagerMsgClient* pDeviceManagerMsgClient = null;
        String key(_DEVICE_MANAGER_SERVICE_ID);
 
        ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_USB_CONNECTED);
@@ -238,15 +237,13 @@ _DeviceManagerImpl::~_DeviceManagerImpl()
        ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_HDMI, DeviceEventVConfCallBack);
        SysTryCatch(NID_SYS, ret == RUNTIME_INFO_ERROR_NONE, r = E_SYSTEM, r, "It is failed to unregister HDMI event");
 
+       pDeviceManagerMsgClient = _DeviceManagerMsgClient::GetInstance();
+       SysTryCatch(NID_SYS, pDeviceManagerMsgClient != null, r = E_SYSTEM, r, "It is failed to get DeviceManagerMsgClient.");
 
-       pCommunicationDispatcherClient = _CommunicationDispatcherClient::GetInstance();
-       SysTryCatch(NID_SYS, pCommunicationDispatcherClient != null, r = E_SYSTEM, r, "It is failed to get CommunicationDispatcherClient.");
-
-       r = pCommunicationDispatcherClient->UnregisterCommunicationListener(key);
-       SysTryCatch(NID_SYS, r == E_SUCCESS, r = E_SYSTEM, r, "It is failed to register on CommunicationDispatcherClient.");
+       r = pDeviceManagerMsgClient->UnregisterListener(_DEVICE_MANAGER_SERVICE_ID);
+       SysTryCatch(NID_SYS, r == E_SUCCESS, r = E_SYSTEM, r, "It is failed to register on DeviceManagerMsgClient.");
 
        __pIpcClient = null;
-
 CATCH:
        SetLastResult(r);
 }
@@ -463,7 +460,8 @@ _DeviceManagerImpl::RequireBluetoothEvent(void)
 
                r = __pIpcClient->SendRequest(pRequest.get());
                SysTryReturnResult(NID_SYS, r == E_SUCCESS,E_SYSTEM, "It is failed to add bluetooth id");
-
+               SysLog(NID_SYS, "It sent %ls", _DEVICE_MANAGER_COMMAND_OPEN);
+               
                responseMessages.RemoveAll(true);
        }
        return r;