From c1d8b69c2ebffcfbebe444c5aa030d5be8e8ebb0 Mon Sep 17 00:00:00 2001 From: Lukasz Bardeli Date: Wed, 27 May 2015 13:01:39 +0200 Subject: [PATCH] [MediaKey] Fix setMediaKeyEventListener method [Verification] Below TCT should pass: MediaKeyEventCallback_onpressed MediaKeyEventCallback_onreleased Change-Id: I2dddb90737550e4981fc343934d315dcce3820c6 Signed-off-by: Lukasz Bardeli --- src/mediakey/mediakey_api.js | 4 ++-- src/mediakey/mediakey_instance.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mediakey/mediakey_api.js b/src/mediakey/mediakey_api.js index feae3b42..fd89c25d 100644 --- a/src/mediakey/mediakey_api.js +++ b/src/mediakey/mediakey_api.js @@ -33,10 +33,10 @@ MediaKeyManager.prototype.setMediaKeyEventListener = function(callback) { native.removeListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK); native.addListener(ON_PRESSED_MEDIA_KEY_EVENT_CALLBACK, function(msg) { - native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type)); + native.callIfPossible(args.callback.onpressed, msg.type); }); native.addListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK, function(msg) { - native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type)); + native.callIfPossible(args.callback.onreleased, msg.type); }); }; diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc index 9d25b6c6..8311ac56 100644 --- a/src/mediakey/mediakey_instance.cc +++ b/src/mediakey/mediakey_instance.cc @@ -36,6 +36,7 @@ MediaKeyInstance::MediaKeyInstance() { MediaKeyInstance::~MediaKeyInstance() { LoggerD("Entered"); + MediaKeyManager::GetInstance().UnregisterMediaKeyEventListener(); } void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args, @@ -80,7 +81,7 @@ void MediaKeyInstance::PostEvent(const std::string& eventCallback, picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); obj["listenerId"] = picojson::value(eventCallback); - obj["type"] = picojson::value(k->second); + obj["type"] = picojson::value((k->second).c_str()); PostMessage(event.serialize().c_str()); } else { -- 2.34.1