From 40335399b4b6cfefc49f0918fead161061f553c8 Mon Sep 17 00:00:00 2001 From: "jk.pu" Date: Tue, 26 Apr 2016 21:37:59 +0900 Subject: [PATCH] [HAM] fix some implementation error. - gps error range return 0 issue. - sleep monitor timestamp return monotonic time. - missing location_manager_unset_setting_changed_cb() at stop() Change-Id: Id36a65a3e4ba78b4d24a8497e586e77e3eef99af Signed-off-by: jk.pu --- .../humanactivitymonitor_manager.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc index 23024e4c..8ecc12b7 100755 --- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc @@ -635,11 +635,11 @@ class HumanActivityMonitorManager::Monitor::GpsMonitor : public HumanActivityMon ("Failed to stop location manager, error: %d (%s)", ret, get_error_message(ret))); } - ret = location_manager_unset_location_batch_cb(handle_); + ret = location_manager_unset_setting_changed_cb(LOCATIONS_METHOD_GPS); if (LOCATIONS_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, - "Failed to unset location listener", - ("Failed to unset location listener, error: %d (%s)", ret, get_error_message(ret))); + "Failed to unset location setting changed cb", + ("Failed to unset location setting changed cb, error: %d (%s)", ret, get_error_message(ret))); } ret = location_manager_destroy(handle_); @@ -757,7 +757,7 @@ class HumanActivityMonitorManager::Monitor::GpsMonitor : public HumanActivityMon gps_info_o["altitude"] = picojson::value(altitude); gps_info_o["speed"] = picojson::value(speed); // TODO(r.galka): errorRange not available in CAPI - gps_info_o["errorRange"] = picojson::value(static_cast(0)); + gps_info_o["errorRange"] = picojson::value(horizontal); gps_info_o[kTimestamp] = picojson::value(static_cast(timestamp)); gps_info_array->push_back(gps_info); @@ -1074,7 +1074,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() } data->insert(std::make_pair(kStatus, picojson::value(sleep_state))); - data->insert(std::make_pair(kTimestamp, picojson::value(static_cast(event->timestamp)))); + data->insert(std::make_pair(kTimestamp, picojson::value(getCurrentTimeStamp(event->timestamp)))); return PlatformResult(ErrorCode::NO_ERROR); }; -- 2.34.1