Revert "[systeminfo] replace runtime API with systemsettings API"

This reverts commit 82b530c69170e53ae96b349f706305bd22c839a2.

Conflicts:
	src/systeminfo/systeminfo-utils.cpp

Change-Id: I6ae5b53465587021f1c5701995f4a6dc2b3d515b

diff --git a/src/systeminfo/systeminfo-utils.cpp b/src/systeminfo/systeminfo-utils.cpp
index 83aea8be9cffa5fd81a2f46c7d45739f92327f30..d0f4ebe7bb5abc12b614b20c99dda0d06c38cc1b 100644 (file)
--- a/src/systeminfo/systeminfo-utils.cpp
+++ b/src/systeminfo/systeminfo-utils.cpp
@@ -22,7 +22,7 @@
 #include <memory>
 #include <mutex>
 
-#include <system_settings.h>
+#include <runtime_info.h>
 #include <system_info.h>
 #include <sys/statfs.h>
 
@@ -72,7 +72,7 @@ static void OnDisplayChangedCb(keynode_t* node, void* event_ptr);
 static void OnDeviceAutoRotationChangedCb(keynode_t* node, void* event_ptr);
 static void OnDeviceOrientationChangedCb(sensor_t sensor, unsigned int event_type,
                                          sensor_data_t *data, void *user_data);
-static void OnLocaleChangedCb(system_settings_key_e key, void* event_ptr);
+static void OnLocaleChangedCb(runtime_info_key_e key, void* event_ptr);
 static void OnNetworkChangedCb(connection_type_e type, void* event_ptr);
 static void OnNetworkValueChangedCb(const char* ipv4_address,
                                     const char* ipv6_address, void* event_ptr);
@@ -498,7 +498,7 @@ class SystemInfoListeners {
   void OnDeviceAutoRotationChangedCallback(keynode_t* node, void* event_ptr);
   void OnDeviceOrientationChangedCallback(sensor_t sensor, unsigned int event_type,
                                           sensor_data_t *data, void *user_data);
-  void OnLocaleChangedCallback(system_settings_key_e key, void* event_ptr);
+  void OnLocaleChangedCallback(runtime_info_key_e key, void* event_ptr);
   void OnNetworkChangedCallback(connection_type_e type, void* event_ptr);
   void OnNetworkValueCallback(const char* ipv4_address,
                               const char* ipv6_address, void* event_ptr);
@@ -811,14 +811,14 @@ PlatformResult SystemInfoListeners::RegisterLocaleListener(const SysteminfoUtils
                                                            SysteminfoInstance& instance)
 {
   if (nullptr == m_locale_listener) {
-    if (SYSTEM_SETTINGS_ERROR_NONE !=
-        system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY,
+    if (RUNTIME_INFO_ERROR_NONE !=
+        runtime_info_set_changed_cb(RUNTIME_INFO_KEY_REGION,
                                     OnLocaleChangedCb, static_cast<void*>(&instance)) ) {
       LoggerE("Country change callback registration failed");
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Country change callback registration failed");
     }
-    if (SYSTEM_SETTINGS_ERROR_NONE !=
-        system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE,
+    if (RUNTIME_INFO_ERROR_NONE !=
+        runtime_info_set_changed_cb(RUNTIME_INFO_KEY_LANGUAGE,
                                     OnLocaleChangedCb, static_cast<void*>(&instance)) ) {
       LoggerE("Language change callback registration failed");
       return PlatformResult(ErrorCode::UNKNOWN_ERR, "Language change callback registration failed");
@@ -832,12 +832,12 @@ PlatformResult SystemInfoListeners::RegisterLocaleListener(const SysteminfoUtils
 PlatformResult SystemInfoListeners::UnregisterLocaleListener()
 {
   if (nullptr != m_locale_listener) {
-    if (SYSTEM_SETTINGS_ERROR_NONE !=
-        system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE) ) {
+    if (RUNTIME_INFO_ERROR_NONE !=
+        runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_LANGUAGE) ) {
       LoggerE("Unregistration of language change callback failed");
     }
-    if (SYSTEM_SETTINGS_ERROR_NONE !=
-        system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY) ) {
+    if (RUNTIME_INFO_ERROR_NONE !=
+        runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_REGION) ) {
       LoggerE("Unregistration of country change callback failed");
     }
     LoggerD("Removed callback for LOCALE");
@@ -1210,7 +1210,7 @@ void SystemInfoListeners::OnDeviceOrientationChangedCallback(sensor_t sensor, un
   }
 }
 
-void SystemInfoListeners::OnLocaleChangedCallback(system_settings_key_e /*key*/, void* event_ptr)
+void SystemInfoListeners::OnLocaleChangedCallback(runtime_info_key_e /*key*/, void* event_ptr)
 {
   if (nullptr != m_locale_listener) {
     SysteminfoInstance* instance = static_cast<SysteminfoInstance*>(event_ptr);
@@ -1436,7 +1436,7 @@ void OnDeviceOrientationChangedCb(sensor_t sensor, unsigned int event_type,
   system_info_listeners.OnDeviceOrientationChangedCallback(sensor, event_type, data, user_data);
 }
 
-void OnLocaleChangedCb(system_settings_key_e key, void* event_ptr)
+void OnLocaleChangedCb(runtime_info_key_e key, void* event_ptr)
 {
   LoggerD("");
   system_info_listeners.OnLocaleChangedCallback(key, event_ptr);
@@ -1543,10 +1543,10 @@ PlatformResult SystemInfoDeviceCapability::GetValueString(const char *key, std::
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 
-static PlatformResult GetRuntimeInfoString(system_settings_key_e key, std::string& platform_string) {
+static PlatformResult GetRuntimeInfoString(runtime_info_key_e key, std::string& platform_string) {
   char* platform_c_string;
-  int err = system_settings_get_value_string(key, &platform_c_string);
-  if (SYSTEM_SETTINGS_ERROR_NONE == err) {
+  int err = runtime_info_get_value_string(key, &platform_c_string);
+  if (RUNTIME_INFO_ERROR_NONE == err) {
     if (nullptr != platform_c_string) {
       platform_string = platform_c_string;
       free(platform_c_string);
@@ -1949,13 +1949,13 @@ PlatformResult SysteminfoUtils::ReportBuild(picojson::object& out) {
 
 PlatformResult SysteminfoUtils::ReportLocale(picojson::object& out) {
   std::string str_language = "";
-  PlatformResult ret = GetRuntimeInfoString(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, str_language);
+  PlatformResult ret = GetRuntimeInfoString(RUNTIME_INFO_KEY_LANGUAGE, str_language);
   if (ret.IsError()) {
     return ret;
   }
 
   std::string str_country = "";
-  ret = GetRuntimeInfoString(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, str_country);
+  ret = GetRuntimeInfoString(RUNTIME_INFO_KEY_REGION, str_country);
   if (ret.IsError()) {
     return ret;
   }