Merge branch 'tizen_3.0' into tizen

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index f127a9f..d867607 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -10,7 +10,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    0.41
+Version:    0.42
 Release:    0
 License:    Apache-2.0 and BSD-2.0 and MIT
 Group:      Development/Libraries

diff --git a/src/common/filesystem/filesystem_provider_storage.cc b/src/common/filesystem/filesystem_provider_storage.cc
index 98bfa43..d58d644 100644 (file)
--- a/src/common/filesystem/filesystem_provider_storage.cc
+++ b/src/common/filesystem/filesystem_provider_storage.cc
@@ -97,9 +97,9 @@ bool OnForeachStorage(int storage_id, storage_type_e type,
 
   StorageType type_ =
       type == STORAGE_TYPE_INTERNAL ?
-          StorageType::kInternal : StorageType::kUnknown;
+          StorageType::kInternal : StorageType::kMmc;
 
-  provider->GetStorages().push_back(
+  provider->AddStorage(
       std::make_shared<Storage>(storage_id, type_, TranslateCoreStorageState(state), path));
   if (type_ == StorageType::kInternal) {
     // TODO check internal storage
@@ -111,6 +111,10 @@ bool OnForeachStorage(int storage_id, storage_type_e type,
   return true;
 }
 
+void FilesystemProviderStorage::AddStorage(std::shared_ptr<Storage> storage) {
+  storages_.push_back(storage);
+}
+
 DeviceChangeStateFun FilesystemProviderStorage::GetListener() {
   return listener_;
 }

diff --git a/src/common/filesystem/filesystem_provider_storage.h b/src/common/filesystem/filesystem_provider_storage.h
index fad628a..34a996e 100644 (file)
--- a/src/common/filesystem/filesystem_provider_storage.h
+++ b/src/common/filesystem/filesystem_provider_storage.h
@@ -42,6 +42,7 @@ class FilesystemProviderStorage : public IFilesystemProvider {
 
   DeviceChangeStateFun GetListener();
   void FillVirtualPaths(int storage_id);
+  void AddStorage(std::shared_ptr<Storage> storage);
 
  private:
   FilesystemProviderStorage();