diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:56:28 +0300 |
|---|---|---|
| committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:58:21 +0300 |
| commit | 9d172a224153e970e81d460d6cb9b734c4599768 (patch) | |
| tree | 61b1b3e575efc81ffb04a2dadc3cc8e2abef4245 | |
| parent | 2cabf0bdee7e2736b90933e378944f35ca591d06 (diff) | |
| download | sdl_core-9d172a224153e970e81d460d6cb9b734c4599768.tar.gz | |
fixup! Add function_id check in request controller
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 6 | ||||
| -rw-r--r-- | src/components/application_manager/test/include/application_manager/mock_application_manager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 99696b0bd3..1ef6e5ceb8 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1387,8 +1387,8 @@ void ApplicationManagerImpl::SendMessageToMobile( // checked against policy permissions if (msg_to_mobile[strings::params].keyExists(strings::correlation_id)) { request_ctrl_.OnMobileResponse( - msg_to_mobile[strings::params][strings::correlation_id].asInt(), - msg_to_mobile[strings::params][strings::connection_key].asInt(), + msg_to_mobile[strings::params][strings::correlation_id].asUInt(), + msg_to_mobile[strings::params][strings::connection_key].asUInt(), msg_to_mobile[strings::params][strings::function_id].asInt()); } else if (app) { mobile_apis::FunctionID::eType function_id = @@ -1695,7 +1695,7 @@ bool ApplicationManagerImpl::ManageHMICommand( command->Run(); if (kResponse == message_type) { const uint32_t correlation_id = - (*(message.get()))[strings::params][strings::correlation_id].asInt(); + (*(message.get()))[strings::params][strings::correlation_id].asUInt(); const int32_t function_id = (*(message.get()))[strings::params][strings::function_id].asInt(); request_ctrl_.OnHMIResponse(correlation_id, function_id); diff --git a/src/components/application_manager/test/include/application_manager/mock_application_manager.h b/src/components/application_manager/test/include/application_manager/mock_application_manager.h index 90ad8c4159..851592cc32 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_application_manager.h @@ -173,7 +173,7 @@ class MockApplicationManager : public application_manager::ApplicationManager { int32_t audio_type)); MOCK_METHOD0(StartDevicesDiscovery, void()); MOCK_METHOD1(StopAudioPassThru, void(int32_t application_key)); - MOCK_METHOD2(TerminateRequest, + MOCK_METHOD3(TerminateRequest, void(const uint32_t connection_key, const uint32_t corr_id, const int32_t function_id)); |