From 3da636afcf99b2227898ff0816f1f92231db6650 Mon Sep 17 00:00:00 2001
From: Lukasz Bardeli <l.bardeli@samsung.com>
Date: Thu, 26 Nov 2015 15:06:48 +0100
Subject: [PATCH] [FMRadio]  update logs

Verification] Code compiles without errors

Change-Id: I92e1665e3b510547be95b756a089ff352478ed59
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
---
 src/radio/radio_instance.cc | 18 ++++++------------
 src/radio/radio_manager.cc  | 15 ++++++++-------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/radio/radio_instance.cc b/src/radio/radio_instance.cc
index 4773f4ba..6e218747 100644
--- a/src/radio/radio_instance.cc
+++ b/src/radio/radio_instance.cc
@@ -123,8 +123,7 @@ void RadioInstance::Start(const picojson::value& args, picojson::object& out) {
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -136,8 +135,7 @@ void RadioInstance::Stop(const picojson::value& args, picojson::object& out) {
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -164,8 +162,7 @@ void RadioInstance::SetFMRadioInterruptedListener(const picojson::value& args,
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -178,8 +175,7 @@ void RadioInstance::UnsetFMRadioInterruptedListener(const picojson::value& args,
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -192,8 +188,7 @@ void RadioInstance::SetAntennaChangeListener(const picojson::value& args,
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
@@ -206,8 +201,7 @@ void RadioInstance::UnsetAntennaChangeListener(const picojson::value& args,
   if (result) {
     ReportSuccess(out);
   } else {
-    LoggerE("Failed");
-    ReportError(result, &out);
+    LogAndReportError(result, &out);
   }
 }
 
diff --git a/src/radio/radio_manager.cc b/src/radio/radio_manager.cc
index 81bb0de2..84931ed2 100755
--- a/src/radio/radio_manager.cc
+++ b/src/radio/radio_manager.cc
@@ -31,6 +31,7 @@
 #include "radio/radio_instance.h"
 
 using namespace common;
+using namespace common::tools;
 using namespace std;
 
 namespace extension {
@@ -60,16 +61,16 @@ PlatformResult GetPlatformResult(const std::string& str, int err) {
 
   switch (err) {
     case RADIO_ERROR_INVALID_PARAMETER:
-      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, message);
+      return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, message);
 
     case RADIO_ERROR_INVALID_STATE:
-      return PlatformResult(ErrorCode::INVALID_STATE_ERR, message);
+      return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, message);
 
     case RADIO_ERROR_NOT_SUPPORTED:
-      return PlatformResult(ErrorCode::SERVICE_NOT_AVAILABLE_ERR, message);
+      return LogAndCreateResult(ErrorCode::SERVICE_NOT_AVAILABLE_ERR, message);
 
     default:
-      return PlatformResult(ErrorCode::UNKNOWN_ERR, message);
+      return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, message);
   }
 }
 
@@ -368,7 +369,7 @@ PlatformResult FMRadioManager::Start(double frequency) {
   }
 
   if (RADIO_STATE_READY != state && RADIO_STATE_PLAYING != state) {
-    return PlatformResult(ErrorCode::INVALID_STATE_ERR, "Invalid radio state.");
+    return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Invalid radio state.");
   }
 
   PlatformResult result = SetFrequency(frequency);
@@ -396,7 +397,7 @@ PlatformResult FMRadioManager::Stop() {
   }
 
   if (RADIO_STATE_PLAYING != state) {
-    return PlatformResult(ErrorCode::INVALID_STATE_ERR, "Invalid radio state.");
+    return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Invalid radio state.");
   }
 
   return CheckError("radio_stop", radio_stop(radio_instance_));
@@ -535,7 +536,7 @@ void FMRadioManager::PostResultFailure(double callbackId, const PlatformResult&
   picojson::value event{picojson::object()};
   auto& obj = event.get<picojson::object>();
 
-  tools::ReportError(result, &obj);
+  LogAndReportError(result, &obj);
   AddCallbackID(callbackId, &obj);
 
   PostMessage(event.serialize());
-- 
2.34.1