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/application_manager/src/application_impl.cc | |
| 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/application_manager/src/application_impl.cc')
| -rw-r--r-- | src/components/application_manager/src/application_impl.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 2d08e1217c..84d292d676 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -129,6 +129,7 @@ ApplicationImpl::ApplicationImpl( protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_3) , is_voice_communication_application_(false) , is_resuming_(false) + , deferred_resumption_hmi_level_(mobile_api::HMILevel::eType::INVALID_ENUM) , is_hash_changed_during_suspend_(false) , video_stream_retry_number_(0) , audio_stream_retry_number_(0) @@ -675,6 +676,16 @@ bool ApplicationImpl::is_resuming() const { return is_resuming_; } +void ApplicationImpl::set_deferred_resumption_hmi_level( + mobile_api::HMILevel::eType level) { + deferred_resumption_hmi_level_ = level; +} + +mobile_api::HMILevel::eType ApplicationImpl::deferred_resumption_hmi_level() + const { + return deferred_resumption_hmi_level_; +} + bool ApplicationImpl::AddFile(const AppFile& file) { if (app_files_.count(file.file_name) == 0) { LOG4CXX_INFO(logger_, |