Merge branch tizen_2.4 into tizen_3.0

Change-Id: I3c0aa0ebab90faca5d91912b914baffb61b29913

diff --cc packaging/webapi-plugins.spec
Simple merge

diff --cc src/application/application_manager.cc
Simple merge

diff --cc src/content/content_manager.cc
index a4556d4,8034620..7856a3e
--- 1/src/content/content_manager.cc
--- 2/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@@ -13,7 -13,7 +13,7 @@@
   *    See the License for the specific language governing permissions and
   *    limitations under the License.
   */
-- 
++
  #include "content/content_manager.h"
  
  #include <algorithm>
@@@ -344,6 -344,62 +344,64 @@@ void ContentToJson(media_info_h info, p
    }
  }
  
 -    } else if (storage_type == MEDIA_CONTENT_STORAGE_CLOUD) {
 -      o["storageType"] = picojson::value(std::string("CLOUD"));
+ void ContentDirToJson(media_folder_h folder, picojson::object& o) {
+   LoggerD("Enter");
+   int ret;
+   char* tmpStr = NULL;
+   media_content_storage_e storage_type;
+   time_t tmpDate;
+ 
+   // id
+   ret = media_folder_get_folder_id(folder, &tmpStr);
+   if(ret == MEDIA_CONTENT_ERROR_NONE) {
+     if(tmpStr) {
+       o["id"] = picojson::value(std::string(tmpStr));
+       free(tmpStr);
+       tmpStr = NULL;
+     }
+   }
+ 
+   // directoryURI
+   ret = media_folder_get_path(folder, &tmpStr);
+   if(ret == MEDIA_CONTENT_ERROR_NONE) {
+     if(tmpStr) {
+       o["directoryURI"] = picojson::value(std::string(tmpStr));
+       free(tmpStr);
+       tmpStr = NULL;
+     }
+   }
+ 
+   // title
+   ret = media_folder_get_name(folder, &tmpStr);
+   if(ret == MEDIA_CONTENT_ERROR_NONE) {
+     if(tmpStr) {
+       o["title"] = picojson::value(std::string(tmpStr));
+       free(tmpStr);
+       tmpStr = NULL;
+     }
+   }
+ 
+   // storageType
+   ret = media_folder_get_storage_type(folder, &storage_type);
+   if(ret == MEDIA_CONTENT_ERROR_NONE) {
+     if (storage_type == MEDIA_CONTENT_STORAGE_INTERNAL) {
+       o["storageType"] = picojson::value(std::string("INTERNAL"));
+     } else if (storage_type == MEDIA_CONTENT_STORAGE_EXTERNAL) {
+       o["storageType"] = picojson::value(std::string("EXTERNAL"));
+     }
++    /* TODO not defined in platform
++    else if (storage_type == MEDIA_CONTENT_STORAGE_CLOUD) {
++      o["storageType"] = picojson::value(std::string("CLOUD"));
++    }*/
+   }
+ 
+   // modifiedData
+   ret = media_folder_get_modified_time(folder, &tmpDate);
+   if(ret == MEDIA_CONTENT_ERROR_NONE) {
+     o["modifiedDate"] = picojson::value(static_cast<double>(tmpDate));
+   }
+ }
+ 
  static int setContent(media_info_h media, const picojson::value& content) {
    LoggerD("Enter");
  

diff --cc src/content/content_manager.h
Simple merge

diff --cc src/messaging/messaging_util.h
Simple merge

diff --cc src/systeminfo/systeminfo-utils.cpp
Simple merge

diff --cc src/utils/utils_api.js
Simple merge