Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/download/download_instance.cc

Change-Id: Ib5546e2489ffdd603e5889e895707b0800209174

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

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

diff --cc src/calendar/calendar_manager.cc
Simple merge

diff --cc src/content/content_manager.cc
index 9ae3bb4fa85eb84583f220a29876c8c13ed2724e,edd86d510861330a56d49e8d24b4fbbf7a56b9d0..53c79bc8908a489bba239588028fe341d1b0cad9
--- 1/src/content/content_manager.cc
--- 2/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@@ -1383,7 -1383,10 +1383,10 @@@ int ContentManager::getLyrics(const pic
    }
  
    metadata_extractor_h extractor;
-   metadata_extractor_create(&extractor);
+   ret = metadata_extractor_create(&extractor);
+   if (METADATA_EXTRACTOR_ERROR_NONE != ret) {
 -    LOGGER(ERROR) << "metadata_extractor_create failed, error: " << ret;
++    LoggerE("metadata_extractor_create failed, error: %d", ret);
+   }
    std::unique_ptr<std::remove_pointer<metadata_extractor_h>::type, int (*)(metadata_extractor_h)>
        extractor_ptr(extractor, &metadata_extractor_destroy);  // automatically release the memory
  

diff --cc src/datacontrol/datacontrol_instance.cc
Simple merge

diff --cc src/download/download_instance.cc
index 722123f285d8f90978c58abd2a3924aa16796961,4e1fa39fd8d7bb74ce1fc9d25d68cdd7756f8cfe..a2770b3ebd858e80c1bcc1c80ecc4ad71945cfa8
--- 1/src/download/download_instance.cc
--- 2/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@@ -318,15 -314,13 +318,14 @@@ gboolean DownloadInstance::OnFinished(v
        LoggerW("%s", get_error_message(ret));
      }
      out["status"] = picojson::value("completed");
+     out["fullPath"] =
+         picojson::value(common::FilesystemProvider::Create().GetVirtualPath(fullPath));
    }
- 
 -  out["callbackId"] = picojson::value(static_cast<double>(callback_id));
 +  out["downloadId"] = picojson::value(static_cast<double>(download_id));
  
-   out["fullPath"] = picojson::value(common::FilesystemProvider::Create().GetVirtualPath(fullPath));
 -  Instance::PostMessage(downCbPtr->instance, picojson::value(out).serialize().c_str());
 -  // downCbPtr is freed in destructor, it prevent from crash if OnFinished state
 +  out["listenerId"] = picojson::value(kDownloadManagerListenerId);
- 
 +  Instance::PostMessage(down_cb_ptr->instance, picojson::value(out).serialize().c_str());
 +  // down_cb_ptr is freed in destructor, it prevent from crash if OnFinished state
    // was called after OnCanceled or OnFailed
    free(fullPath);
  

diff --cc src/exif/jpeg_file.cc
Simple merge

diff --cc src/filesystem/filesystem_manager.cc
Simple merge

diff --cc src/keymanager/keymanager_instance.cc
Simple merge

diff --cc src/messaging/email_manager.cc
Simple merge

diff --cc src/messaging/message.cc
Simple merge