[MediaKey] Log refactoring.

[Verification] TCT pass rate (r20): 100% (11/11/0/0/0).

Change-Id: Ibf4ab9ee572ede36f80a47a5099b3a23efecdad5
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>

diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc
index ec3af1b3270f98b4a62103c13feb5a510270a969..892ba074b8379185fe6a955a04e7a8c57985e96f 100755 (executable)
--- a/src/mediakey/mediakey_instance.cc
+++ b/src/mediakey/mediakey_instance.cc
@@ -59,8 +59,7 @@ void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args,
   common::PlatformResult result = MediaKeyManager::GetInstance()
       .RegisterMediaKeyEventListener(this);
   if (result.IsError()) {
-    LOGD("Error occured");
-    ReportError(result, &out);
+    LogAndReportError(result, &out, ("Failed to set media key event listener"));
   } else {
     ReportSuccess(out);
   }
@@ -72,8 +71,7 @@ void MediaKeyInstance::UnsetMediaKeyEventListener(const picojson::value& args,
   common::PlatformResult result = MediaKeyManager::GetInstance()
       .UnregisterMediaKeyEventListener();
   if (result.IsError()) {
-    LOGD("Error occured");
-    ReportError(result, &out);
+    LogAndReportError(result, &out, ("Failed to remove media key event listener"));
   } else {
     ReportSuccess(out);
   }

diff --git a/src/mediakey/mediakey_manager.cc b/src/mediakey/mediakey_manager.cc
index 29ee1e02e3c1705c45d798f3f740e02ddb1b497e..0ba6aea72a2eb16100d03d9114264e384035bfb8 100755 (executable)
--- a/src/mediakey/mediakey_manager.cc
+++ b/src/mediakey/mediakey_manager.cc
@@ -46,12 +46,10 @@ common::PlatformResult MediaKeyManager::RegisterMediaKeyEventListener(
     int ret = media_key_reserve(MediaKeyEventCallback, NULL);
     LoggerD("after calling media_key_reserve - result = %d", ret);
     if (MEDIA_KEY_ERROR_NONE != ret) {
-      LoggerD("Failed to register "
-              "a media keys change event callback: %d",
-              ret);
-      return common::PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::UNKNOWN_ERR,
-          "Failed to register a media keys change event callback");
+          "Failed to register a media keys change event callback",
+          ("media_key_reserve() error: %d, message: %s", ret, get_error_message(ret)));
     }
     m_media_key_listener = listener;
     m_media_key_listener_registered = true;
@@ -64,12 +62,10 @@ common::PlatformResult MediaKeyManager::UnregisterMediaKeyEventListener() {
   if (m_media_key_listener_registered) {
     int ret = media_key_release();
     if (MEDIA_KEY_ERROR_NONE != ret) {
-      LoggerD("Failed to unregister "
-              "the change event callback function: %d",
-              ret);
-      return common::PlatformResult(
+      return LogAndCreateResult(
           ErrorCode::UNKNOWN_ERR,
-          "Failed to unregister the change event callback function");
+          "Failed to unregister the change event callback function",
+          ("media_key_release() error: %d, message: %s", ret, get_error_message(ret)));
     }
   }
   m_media_key_listener = NULL;