Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I87da3bb68de8658d2330fe09dcd736acc5d809dd

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 98fbaee..0d4abbc 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -10,7 +10,7 @@
 
 
 Name:       webapi-plugins
-Version:    2.59
+Version:    2.60
 Release:    0
 License:    Apache-2.0 and BSD-3-Clause and MIT
 Group:      Development/Libraries

diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc
index ad21859..864639c 100644 (file)
--- a/src/application/application_manager.cc
+++ b/src/application/application_manager.cc
@@ -647,9 +647,8 @@ void ApplicationManager::Launch(const picojson::value& args) {
    * New implementation, using app_control_send_launch_request_async makes only one attempt.
    * If problems, such as failed application start occur, multiple attempts may solve the problem.
    */
-  auto launch_result =
-      TranslateLaunchError(static_cast<app_control_error_e>(app_control_send_resume_request(
-          app_control_ptr.get(), result_callback, launch_user_data)));
+  auto launch_result = TranslateLaunchError(static_cast<app_control_error_e>(
+      app_control_send_resume_request(app_control_ptr.get(), result_callback, launch_user_data)));
 
   if (launch_result.IsError()) {
     delete launch_user_data;