From: Hokwon Song <hokwon.song@samsung.com>
Date: Thu, 31 Oct 2013 07:05:49 +0000 (+0000)
Subject: Merge "Add to read a custum feature key." into tizen_2.2
X-Git-Tag: submit/tizen/20131210.080830^2^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6bc8e56423271f5d0a441e8b6c2afdbe80ffb77;hp=016ae83eef1caf07a07fcddb72849c535c6b72e1;p=platform%2Fframework%2Fnative%2Fappfw.git

Merge "Add to read a custum feature key." into tizen_2.2
---

diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp
index 0f4b53d..8cc29b0 100644
--- a/src/system/FSys_SystemInfoImpl.cpp
+++ b/src/system/FSys_SystemInfoImpl.cpp
@@ -572,7 +572,12 @@ _SystemInfoImpl::GetSysInfo(const String& key, int& value)
 			SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "[%s] StringUtil::StringToUtf8N It is failed", GetErrorMessage(r));
 
 			ret = system_info_get_platform_int(systemKey.get(), &value);
-			SysTryReturnResult(NID_SYS, ret == SYSTEM_INFO_ERROR_NONE, E_OBJ_NOT_FOUND, "It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
+			if (ret != SYSTEM_INFO_ERROR_NONE)
+			{
+				ret = system_info_get_custom_int(systemKey.get(), &value);
+				SysTryReturnResult(NID_SYS, ret == SYSTEM_INFO_ERROR_NONE, E_OBJ_NOT_FOUND,
+					"It is failed to get system information %ls from configration file.", tizenKey.GetPointer());
+			}
 			r = E_SUCCESS;
 		}
 	}
@@ -634,13 +639,17 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value)
 		int ret = system_info_get_platform_bool(systemKey.get(), &supported);
 		if(ret != SYSTEM_INFO_ERROR_NONE)
 		{
-			String screenKey(L"http://tizen.org/feature/screen.size");
-			String requiredKey;
-			tizenKey.SubString(0, screenKey.GetLength(), requiredKey);
-
-			if(requiredKey == screenKey)
+			ret = system_info_get_custom_bool(systemKey.get(), &supported);
+			if (ret != SYSTEM_INFO_ERROR_NONE)
 			{
-				value = false;
+				String screenKey(L"http://tizen.org/feature/screen.size");
+				String requiredKey;
+				tizenKey.SubString(0, screenKey.GetLength(), requiredKey);
+
+				if(requiredKey == screenKey)
+				{
+					value = false;
+				}
 			}
 		}