From 8af8e7142f33b00fb29f35e30f0811c519460e03 Mon Sep 17 00:00:00 2001 From: Frank Ronneburg Date: Thu, 5 Apr 2018 03:21:41 +0900 Subject: 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 --- .../include/test/application_manager/mock_application_manager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/components/include/test/application_manager/mock_application_manager.h') 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)); -- cgit v1.2.1