summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Nosach <ANosach@luxoft.com>2015-03-30 17:33:22 +0300
committerArtem Nosach <ANosach@luxoft.com>2015-04-23 15:32:47 +0300
commitf3f12cb129b29d9bc852ed2543cfaeeadfb62a06 (patch)
tree836586f76c39438e8b89df25d364a24e5b5c02ab
parent062f070500807eb24ad1e0493d5260f6dbd36684 (diff)
downloadsmartdevicelink-f3f12cb129b29d9bc852ed2543cfaeeadfb62a06.tar.gz
Remove useless flag <launch_hmi> checking.
-rw-r--r--src/appMain/smartDeviceLink.ini2
-rw-r--r--src/components/application_manager/src/commands/mobile/register_app_interface_request.cc17
2 files changed, 9 insertions, 10 deletions
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini
index eef038e09..137f58ed6 100644
--- a/src/appMain/smartDeviceLink.ini
+++ b/src/appMain/smartDeviceLink.ini
@@ -185,7 +185,7 @@ HashStringSize = 32
[SDL4]
; Enables SDL 4.0 support
-EnableProtocol4 = true
+EnableProtocol4 = false
; Path where apps icons must be stored
AppIconsFolder = storage
; Max size of the folder in bytes
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index b2c08b66b..2f8ac29aa 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -155,15 +155,14 @@ void RegisterAppInterfaceRequest::Run() {
// Flag conditional compilation specific to customer is used in order to exclude hit code
// to RTC
// FIXME(EZamakhov): on shutdown - get freez
- if (true == profile::Profile::instance()->launch_hmi()) {
- // wait till HMI started
- while (!ApplicationManagerImpl::instance()->IsHMICooperating()) {
- sleep(1);
- // TODO(DK): timer_->StartWait(1);
- ApplicationManagerImpl::instance()->updateRequestTimeout(connection_key(),
- correlation_id(),
- default_timeout());
- }
+
+ // wait till HMI started
+ while (!ApplicationManagerImpl::instance()->IsHMICooperating()) {
+ sleep(1);
+ // TODO(DK): timer_->StartWait(1);
+ ApplicationManagerImpl::instance()->updateRequestTimeout(connection_key(),
+ correlation_id(),
+ default_timeout());
}
const std::string mobile_app_id = (*message_)[strings::msg_params][strings::app_id]