Changed implementation getDeviceName() for TV

Change-Id: I99c56d1cbb26228195139a52d99686bef4f1ae73
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/daemon/ServiceManager.cpp b/daemon/ServiceManager.cpp
index 07615a0..191ba87 100755 (executable)
--- a/daemon/ServiceManager.cpp
+++ b/daemon/ServiceManager.cpp
@@ -282,9 +282,11 @@ static iotcon_representation_h _get_d2d_service_representation(conv::ServiceMana
 
        iotcon_attributes_add_str(attributes, CONV_JSON_DEVICE_ID, deviceId);
        iotcon_attributes_add_str(attributes, CONV_JSON_DEVICE_NAME, deviceName);
-#ifdef _TV_
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_TV_PRODUCT)
+       _D("device type : TV");
        string device_type("TV");
 #else
+       _D("device type : MOBILE");
        string device_type("MOBILE");
 #endif
        iotcon_attributes_add_str(attributes, CONV_JSON_DEVICE_TYPE, (char*) device_type.c_str());

diff --git a/daemon/Util.cpp b/daemon/Util.cpp
index b377608..fc83b42 100755 (executable)
--- a/daemon/Util.cpp
+++ b/daemon/Util.cpp
@@ -47,16 +47,18 @@ std::string conv::util::getBtMacAddress()
 
 std::string conv::util::getDeviceName()
 {
-       static std::string __deviceName;
-       if(__deviceName.empty()) {
-               char* deviceName = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
-               if (deviceName == NULL) {
-                       __deviceName = "Tizen";
-               } else {
-                       __deviceName = deviceName;
-               }
-               _D("device_name: %s", __deviceName.c_str());
+       std::string __deviceName;
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_TV_PRODUCT)
+       char* deviceName = vconf_get_str("db/menu/network/devicename/tv_name");
+#else
+       char* deviceName = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+#endif
+       if (deviceName == NULL) {
+               __deviceName = "Tizen";
+       } else {
+               __deviceName = deviceName;
        }
+       _D("device_name: %s", __deviceName.c_str());
 
        return __deviceName;
 }
@@ -151,7 +153,7 @@ std::string conv::util::getDeviceId()
                __deviceId = Service::getUniqueId("127.0.0.1:8001");
 
                if(__deviceId.empty())
-#ifdef _TV_
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_TV_PRODUCT)
                        __deviceId = getBtMacAddress();
 #else
                        __deviceId = getP2pMacAddress();