[Common][Systeminfo] deviced used for mobile profile

[Feature] Deviced is used to handle sdcard on mobile now

[Verification] Code compiles without errors.
  TCT passrate of filesystem(auto and manual) - 100%
  TCT passrate of systeminfo - 100%

  Verification was done on binary 0511.1 with installed latest deviced package.

Change-Id: I282334ab55a996db79f502d606ced56fd6107665
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/common/common.gyp b/src/common/common.gyp
index a4e9414cbeaade6df1556e88e8270e19a65c8fe7..322b086292f11f3be3d40d982e38844112b5e141 100644 (file)
--- a/src/common/common.gyp
+++ b/src/common/common.gyp
@@ -57,17 +57,13 @@
         'tizen_result.h',
         'tizen_instance.cc',
         'tizen_instance.h',
+        'filesystem/filesystem_provider_deviced.h',
+        'filesystem/filesystem_provider_deviced.cc',
       ],
       'cflags': [
         '-fvisibility=default',
       ],
       'conditions': [
-        ['extension_host_os == "tv"', {
-          'sources': [
-            'filesystem/filesystem_provider_deviced.h',
-            'filesystem/filesystem_provider_deviced.cc',
-          ]
-        }],
         ['tizen == 1', {
           'variables': {
             'packages': [

diff --git a/src/common/filesystem/filesystem_provider.cc b/src/common/filesystem/filesystem_provider.cc
index f2a69e7ed9fd5204edc38eb57ea149eaab49022c..7cb6c1a27ce456f644c96e619a1f5f04c510ff62 100644 (file)
--- a/src/common/filesystem/filesystem_provider.cc
+++ b/src/common/filesystem/filesystem_provider.cc
@@ -15,9 +15,7 @@
  */
 
 #include "common/filesystem/filesystem_provider.h"
-#ifdef TIZEN_TV
 #include "common/filesystem/filesystem_provider_deviced.h"
-#endif
 #include "common/filesystem/filesystem_provider_storage.h"
 
 namespace common {
@@ -33,11 +31,7 @@ IFilesystemProvider::~IFilesystemProvider() {
 
 
 FilesystemProvider::FilesystemProvider() :
-#ifdef TIZEN_TV
     provider_ (FilesystemProviderDeviced::Create())
-#else
-    provider_ (FilesystemProviderStorage::Create())
-#endif
 {
 }
 

diff --git a/src/systeminfo/systeminfo_properties_manager.cc b/src/systeminfo/systeminfo_properties_manager.cc
index 163e06a8a3e147f35b145ede76b08411bf020370..94b4fa5e843260ec67c2843111b335b41b68abae 100644 (file)
--- a/src/systeminfo/systeminfo_properties_manager.cc
+++ b/src/systeminfo/systeminfo_properties_manager.cc
@@ -1165,7 +1165,6 @@ static void CreateStorageInfo(const std::string& type, struct statfs& fs, picojs
   out->insert(std::make_pair("isRemovable", picojson::value(isRemovable)));
 }
 
-#ifdef TIZEN_TV
 static std::string FromStorageTypeToStringType(common::StorageType type) {
   switch(type) {
     case common::StorageType::kUsbDevice:
@@ -1178,7 +1177,6 @@ static std::string FromStorageTypeToStringType(common::StorageType type) {
       return kTypeUnknown;
   }
 }
-#endif
 
 PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out) {
   LoggerD("Entered");
@@ -1199,7 +1197,6 @@ PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out)
   manager_.SetAvailableCapacityInternal(fs.f_bavail);
 
   // handling external storages
-#ifdef TIZEN_TV
   common::FilesystemProvider& provider(common::FilesystemProvider::Create());
   auto storages = provider.GetStorages();
   LoggerD("Storages found %d", storages.size());
@@ -1212,24 +1209,16 @@ PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out)
       array.push_back(picojson::value(picojson::object()));
       picojson::object& external_obj = array.back().get<picojson::object>();
       CreateStorageInfo(FromStorageTypeToStringType(storage->type()), fs, &external_obj);
+#ifdef TIZEN_TV
       // TODO some tracking of available capacity of usb storages should be applied
-    }
-  }
 #else
-  int sdcardState = 0;
-  if (0 == vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &sdcardState)) {
-    if (VCONFKEY_SYSMAN_MMC_MOUNTED == sdcardState){
-      if (statfs(kStorageSdcardPath.c_str(), &fs) < 0) {
-        return LogAndCreateResult(
-                  ErrorCode::UNKNOWN_ERR, "MMC mounted, but not accessible");
-      }
-      array.push_back(picojson::value(picojson::object()));
-      picojson::object& external_obj = array.back().get<picojson::object>();
-      CreateStorageInfo(kTypeMmc, fs, &external_obj);
+      // Only one storage would be tracked, if more than one SD card would be supported on device
+      // different mechanism should be applied
       manager_.SetAvailableCapacityMmc(fs.f_bavail);
+#endif
     }
   }
-#endif
+
   out->insert(std::make_pair("storages", picojson::value(result)));
   return PlatformResult(ErrorCode::NO_ERROR);
 }