modify system-info key string 07/35907/2 accepted/tizen/common/20150226.085124 accepted/tizen/mobile/20150226.100613 accepted/tizen/tv/20150226.094508 accepted/tizen/wearable/20150226.095738 submit/tizen/20150226.055334
authorJiyoung Yun <jy910.yun@samsung.com>
Thu, 26 Feb 2015 02:06:19 +0000 (11:06 +0900)
committerJiyoung Yun <jy910.yun@samsung.com>
Thu, 26 Feb 2015 02:09:41 +0000 (11:09 +0900)
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
Change-Id: Ib9f5b04ba67326dc176aaa1183504ee840bd8dc3

src/sdb.c
src/services.c

index 20d190a3e049f0d582434a0a13bee6400452b291..5804ab721c122698c981e2584b09e4ede0e78cd5 100644 (file)
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -44,6 +44,7 @@
 #endif
 #include <system_info.h>
 #define PROC_CMDLINE_PATH "/proc/cmdline"
+#define SYSTEM_INFO_KEY_MODEL           "http://tizen.org/system/model_name"
 #if SDB_TRACE
 SDB_MUTEX_DEFINE( D_lock );
 #endif
@@ -406,7 +407,7 @@ int get_emulator_name(char str[], int str_size) {
 
 int get_device_name(char str[], int str_size) {
     char *value = NULL;
-    int r = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &value);
+    int r = system_info_get_platform_string(SYSTEM_INFO_KEY_MODEL, &value);
     if (r != SYSTEM_INFO_ERROR_NONE) {
         D("fail to get system model:%d\n", errno);
         return -1;
index 0113d96302906d43808598c6ca0bd72033def541..2b2174e3cbd65b9d1fc8fb659c202470420d150f 100644 (file)
 #include "strutils.h"
 #include <system_info.h>
 #include <tzplatform_config.h>
+
+#define SYSTEM_INFO_KEY_MODEL           "http://tizen.org/system/model_name"
+#define SYSTEM_INFO_KEY_PLATFORM_NAME   "http://tizen.org/system/platform.name"
+
 typedef struct stinfo stinfo;
 
 struct stinfo {
@@ -598,7 +602,7 @@ static void get_platforminfo(int fd, void *cookie) {
     char *value = NULL;
     s_strncpy(sysinfo.platform_info_version, INFO_VERSION, strlen(INFO_VERSION));
 
-    int r = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &value);
+    int r = system_info_get_platform_string(SYSTEM_INFO_KEY_MODEL, &value);
     if (r != SYSTEM_INFO_ERROR_NONE) {
         s_strncpy(sysinfo.model_name, UNKNOWN, strlen(UNKNOWN));
         D("fail to get system model:%d\n", errno);
@@ -610,7 +614,7 @@ static void get_platforminfo(int fd, void *cookie) {
         }
     }
 
-    r = system_info_get_value_string(SYSTEM_INFO_KEY_PLATFORM_NAME, &value);
+    r = system_info_get_platform_string(SYSTEM_INFO_KEY_PLATFORM_NAME, &value);
     if (r != SYSTEM_INFO_ERROR_NONE) {
         s_strncpy(sysinfo.platform_name, UNKNOWN, strlen(UNKNOWN));
         D("fail to get platform name:%d\n", errno);