From: Hyunjin Park <hj.na.park@samsung.com>
Date: Tue, 6 Dec 2016 08:28:03 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20161206.092612^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2035e5e835b868f8f17540e7d3c5a573422666a5;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen
---

2035e5e835b868f8f17540e7d3c5a573422666a5
diff --cc src/convergence/convergence_remote_app_control_service.cc
index 201b26d8,f6525232..53ef57f5
--- a/src/convergence/convergence_remote_app_control_service.cc
+++ b/src/convergence/convergence_remote_app_control_service.cc
@@@ -123,7 -128,7 +128,8 @@@ TizenResult ConvergenceRemoteAppControl
      return LogAndCreateTizenError(AbortError, "Service with specified type does not exist");
    }
  
-   const int error = conv_service_disconnect(service);
+   int error = conv_service_disconnect(service);
++
    if (CONV_ERROR_NONE != error) {
      return LogAndCreateTizenError(AbortError, "conv_service_disconnect [Fail]");
    } else {
diff --cc src/convergence/convergence_utils.cc
index bfc67b0b,bbe9a7c0..f14cac20
--- a/src/convergence/convergence_utils.cc
+++ b/src/convergence/convergence_utils.cc
@@@ -95,6 -95,8 +95,9 @@@ common::TizenResult ConvergenceUtils::C
        // return common::InvalidStateError(error);
        return common::AbortError(error);
    }
+ 
+   return common::TizenSuccess();
++
  }
  
  } // namespace convergence