From: Lukasz Bardeli <l.bardeli@samsung.com>
Date: Thu, 12 Jul 2018 08:08:07 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180712.082455^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F183913%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Ib0a0675b868f145f94825b3b209ed779e648df73
---

48371350deb80c8560b6d7484e80d0aee91a9d9d
diff --cc src/humanactivitymonitor/humanactivitymonitor_manager.cc
index ba187c1f,1dc5779d..d8d0d843
--- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@@ -269,9 -269,10 +269,10 @@@ class HumanActivityMonitorManager::Moni
    class GestureMonitor;
    class SensorMonitor;
    class GpsMonitor;
+   class PedometerMonitor;
  
    explicit Monitor(const std::string& t) : type_(t) {
 -    ScopeLogger(type());
 +    ScopeLogger("type %s", type().c_str());
    }
  
    virtual ~Monitor() {
@@@ -533,12 -534,12 +534,12 @@@ class HumanActivityMonitorManager::Moni
    SensorMonitor(const std::string& t, sensor_type_e s, const SensorEventConverter& c,
                  const SensorRecordedConverter& r)
        : Monitor(t),
-         sensor_(s),
-         handle_(nullptr),
          converter_(c),
          converter_recorded_(r),
+         sensor_(s),
+         handle_(nullptr),
          recorded_data_(nullptr) {
 -    ScopeLogger(type());
 +    ScopeLogger("type %s", type().c_str());
    }
  
    virtual ~SensorMonitor() override {