diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:07:24 +0300 |
|---|---|---|
| committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:07:24 +0300 |
| commit | d40b5d9aadc17a3ff08bd10d1ee8b315234b4ba3 (patch) | |
| tree | e6b91576ecebcceb90df767b744244a3f93642ec | |
| parent | ff41365d0080d2437e8a17ae1b857add1add775b (diff) | |
| download | sdl_core-d40b5d9aadc17a3ff08bd10d1ee8b315234b4ba3.tar.gz | |
fixup! Add function_id check in request controller
4 files changed, 8 insertions, 5 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager.h b/src/components/application_manager/include/application_manager/application_manager.h index 872fb6fe5e..e67864b9b1 100644 --- a/src/components/application_manager/include/application_manager/application_manager.h +++ b/src/components/application_manager/include/application_manager/application_manager.h @@ -412,9 +412,10 @@ class ApplicationManager { * @brief TerminateRequest forces termination of request * @param connection_key - application id of request * @param corr_id correlation id of request + * @param function_id function id of request */ - virtual void TerminateRequest(uint32_t connection_key, - uint32_t corr_id, + virtual void TerminateRequest(const uint32_t connection_key, + const uint32_t corr_id, const int32_t function_id) = 0; /* diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 35d9d19d9a..be52046888 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -711,6 +711,7 @@ class ApplicationManagerImpl * @brief TerminateRequest forces termination of request * @param connection_key - application id of request * @param corr_id correlation id of request + * @param function_id function id of request */ void TerminateRequest(const uint32_t connection_key, const uint32_t corr_id, diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h index dafc28ebdc..4497bd4862 100644 --- a/src/components/application_manager/include/application_manager/request_controller.h +++ b/src/components/application_manager/include/application_manager/request_controller.h @@ -139,6 +139,7 @@ class RequestController { * * @param correlation_id Active request correlation ID, * @param connection_key Active request connection key (0 for HMI requersts) + * @param function_id Active request function id * @param force_terminate if true, request controller will terminate * even if not allowed by request */ 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 ea1542ecf5..90ad8c4159 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 @@ -174,9 +174,9 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD0(StartDevicesDiscovery, void()); MOCK_METHOD1(StopAudioPassThru, void(int32_t application_key)); MOCK_METHOD2(TerminateRequest, - void(uint32_t connection_key, - uint32_t corr_id, - int32_t function_id)); + void(const uint32_t connection_key, + const uint32_t corr_id, + const int32_t function_id)); MOCK_METHOD4(UnregisterApplication, void(const uint32_t&, mobile_apis::Result::eType, bool, bool)); MOCK_METHOD3(updateRequestTimeout, |