diff options
| author | Frank Ronneburg <fronneburg@xevo.com> | 2018-04-05 03:21:41 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-04-04 14:28:44 -0700 |
| commit | 8af8e7142f33b00fb29f35e30f0811c519460e03 (patch) | |
| tree | b3c06edd7dcfb61693dcbde10c39b3d419bb5d48 /src/components/include/test/application_manager/mock_application_manager.h | |
| parent | 926e8db70ceae88a4b11a028d9c37abbee9208e9 (diff) | |
| download | sdl_core-8af8e7142f33b00fb29f35e30f0811c519460e03.tar.gz | |
Merge pull request #229 in NAR/sdl-core from feat/disable_resumption_before_secondary_transport_2 to feature/Ford-WiFi
* commit 'bfe8579a831b873c8d0c1f950d46498ed3939a90':
Enable retrying resumption after secondary transport is established
Disable or limit resumption based on availability of high-bandwidth transport
Add TransportRequiredForResumption and LowBandwidthTransportResumptionLevel sections in .ini file
Update ReadStringContainer()
Add required DeviceType enums
Conflicts:
src/components/include/test/application_manager/mock_application_manager.h
src/components/include/transport_manager/transport_adapter/transport_adapter.h
src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
Diffstat (limited to 'src/components/include/test/application_manager/mock_application_manager.h')
| -rw-r--r-- | src/components/include/test/application_manager/mock_application_manager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index 452a1e6c39..3d97279b39 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -143,6 +143,8 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD0(hmi_capabilities, application_manager::HMICapabilities&()); MOCK_CONST_METHOD0(hmi_capabilities, const application_manager::HMICapabilities&()); + MOCK_CONST_METHOD1(CheckResumptionRequiredTransportAvailable, + bool(ApplicationConstSharedPtr application)); MOCK_METHOD2(ProcessQueryApp, void(const smart_objects::SmartObject& sm_object, const uint32_t connection_key)); |