include vconf-internal-keys for VCONFKEY_SYSMAN_MMC_STATUS
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 9 Jun 2015 07:46:32 +0000 (16:46 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 9 Jun 2015 07:46:32 +0000 (16:46 +0900)
Change-Id: Ie9d5063eb38f5cb35b16c044af2fed2a4d3bc6bf

src/systeminfo/systeminfo-utils.cpp

index 37b5cdb7a751d864e0f5d1fa2a72efc6431c309c..80e57ba47dbea4bffef0396b9f6290af757242df 100644 (file)
@@ -27,6 +27,7 @@
 #include <sys/statfs.h>
 
 #include <vconf.h>
+#include <vconf-internal-keys.h>
 #include <net_connection.h>
 #include <tapi_common.h>
 #include <ITapiModem.h>
@@ -711,7 +712,7 @@ PlatformResult SystemInfoListeners::UnregisterCpuListener()
 PlatformResult SystemInfoListeners::RegisterStorageListener(const SysteminfoUtilsCallback& callback,
                                                             SysteminfoInstance& instance)
 {
-/*  if (nullptr == m_storage_listener) {
+  if (nullptr == m_storage_listener) {
     PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR);
     CHECK_LISTENER_ERROR(
         RegisterVconfCallback(VCONFKEY_SYSMAN_MMC_STATUS, OnMmcChangedCb, instance))
@@ -719,13 +720,13 @@ PlatformResult SystemInfoListeners::RegisterStorageListener(const SysteminfoUtil
     m_storage_event_id = g_timeout_add_seconds(kPropertyWatcherTime, OnStorageChangedCb, static_cast<void*>(&instance));
     LoggerD("Added callback for STORAGE");
     m_storage_listener = callback;
-  }*/
+  }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 
 PlatformResult SystemInfoListeners::UnregisterStorageListener()
 {
-/*  if (nullptr != m_storage_listener) {
+  if (nullptr != m_storage_listener) {
     PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR);
     CHECK_LISTENER_ERROR(
         UnregisterVconfCallback(VCONFKEY_SYSMAN_MMC_STATUS, OnMmcChangedCb))
@@ -734,7 +735,7 @@ PlatformResult SystemInfoListeners::UnregisterStorageListener()
     m_storage_event_id = 0;
     LoggerD("Removed callback for STORAGE");
     m_storage_listener = nullptr;
-  }*/
+  }
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 
@@ -2635,7 +2636,7 @@ PlatformResult SysteminfoUtils::ReportStorage(picojson::object& out) {
   CreateStorageInfo(kTypeInternal, fs, &internal_obj);
   system_info_listeners.SetAvailableCapacityInternal(fs.f_bavail);
 
-/*  if (0 == vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &sdcardState)) {
+  if (0 == vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &sdcardState)) {
     if (VCONFKEY_SYSMAN_MMC_MOUNTED == sdcardState){
       if (statfs(kStorageSdcardPath, &fs) < 0) {
         LoggerE("MMC mounted, but not accessible");
@@ -2646,7 +2647,7 @@ PlatformResult SysteminfoUtils::ReportStorage(picojson::object& out) {
       CreateStorageInfo(kTypeMmc, fs, &external_obj);
       system_info_listeners.SetAvailableCapacityMmc(fs.f_bavail);
     }
-  }*/
+  }
 
   out.insert(std::make_pair("storages", picojson::value(result)));
   return PlatformResult(ErrorCode::NO_ERROR);