Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'hotfix/HMIReconnectionSupport' into release/4.0.0 | Alexandr Galiuzov | 2015-06-13 | 5 | -9/+48 | |
|\ \ \ | ||||||
| * | | | Fix reconection HMI | Alexander Kutsan | 2015-05-25 | 5 | -3/+36 | |
| | | | | | | | | | | | | | | | | On unexpected disconnect MB should unregister all components, by socket | |||||
| * | | | Fix broken PIPE on Send | Alexander Kutsan | 2015-05-25 | 1 | -6/+12 | |
| |/ / | ||||||
* | | | Merge pull request #122 from LuxoftSDL/hotfix/unsigned-vars | AGaliuzov | 2015-06-13 | 1 | -21/+5 | |
|\ \ \ | | | | | | | | | Remove check <0 for unsigned int | |||||
| * | | | APPLINK-13255. Remove check <0 for unsigned int | Aleksandr Galiuzov | 2015-05-22 | 1 | -21/+5 | |
| |/ / | ||||||
* | | | Merge branch 'hotfix/UpdateAppList_invalid_json' into release/4.0.0 | Alexandr Galiuzov | 2015-06-13 | 2 | -16/+38 | |
|\ \ \ | ||||||
| * | | | Post review changes. | Artem Nosach | 2015-05-20 | 1 | -2/+5 | |
| | | | | ||||||
| * | | | Fill HMIApplication struct correctly. | Artem Nosach | 2015-05-19 | 1 | -5/+14 | |
| | | | | ||||||
| * | | | Set default ttsName and vrSynonym as array. | Artem Nosach | 2015-05-19 | 1 | -1/+5 | |
| |/ / | ||||||
* | | | Merge branch 'hotfix/APPLINK-13063' into release/4.0.0 | Alexandr Galiuzov | 2015-06-13 | 1 | -9/+20 | |
|\ \ \ | ||||||
| * | | | APPLINK-13063: [RTC 597337] During PerformInteraction SDL is not forwarding ↵ | Dmitriy Klimenko | 2015-06-13 | 1 | -9/+20 | |
|/ / / | | | | | | | | | | UI.OnKeyboardInput to non-navigation Apps fix | |||||
* | | | Merge branch 'hotfix/AppManagerTestFix' into release/4.0.0 | Alexandr Galiuzov | 2015-06-13 | 3 | -2/+7 | |
|\ \ \ | ||||||
| * | | | APPLINK-12833 Fix timeout in requests | Alexander Kutsan | 2015-05-14 | 3 | -2/+7 | |
| |/ / | | | | | | | | | | | | | | | | Conflicts: src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc src/components/application_manager/test/request_info_test.cc | |||||
* | | | Merge branch 'hotfix/FixStateCtrlAndResumption' into release/4.0.0 | Alexandr Galiuzov | 2015-06-13 | 2 | -4/+22 | |
|\ \ \ | ||||||
| * | | | APPLINK-12957 Fix StateCtrl and resumption | Alexander Kutsan | 2015-05-07 | 2 | -4/+22 | |
| |/ / | | | | | | | | | | | | | Add check in stateCtrl if application trying to set LIMITED or AUDIBLE for non media app Add check in resuption is allowed limited or not | |||||
* | | | Merge branch 'hotfix/MB_Loose_messages' into release/4.0.0 | Alexandr Galiuzov | 2015-06-12 | 3 | -56/+50 | |
|\ \ \ | ||||||
| * | | | Some Style fixes | Alexander Kutsan | 2015-05-07 | 3 | -45/+40 | |
| | | | | ||||||
| * | | | Fix pasing message with multiple jsons | Alexander Kutsan | 2015-05-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | HMI can send Messages with redudant \n in tail of each json. Websocket unparcd data can contain '{', that could be interpereted as starting of json message. | |||||
| * | | | Parce WebSockedData fix | Alexander Kutsan | 2015-05-07 | 1 | -10/+9 | |
| |/ / | ||||||
* | | | Merge branch 'hotfix/APPLINK-11998' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 7 | -7/+98 | |
|\ \ \ | ||||||
| * | | | APPLINK-11998: Need to Add HMICapabilties | Dmitriy Klimenko | 2015-05-05 | 7 | -11/+109 | |
| |/ / | | | | | | | | | | | | | | | | Conflicts: src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc src/components/interfaces/MOBILE_API.xml | |||||
* | | | Merge branch 'hotfix/fix-sdl4.0-merge-issues' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 3 | -5/+22 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Some code has been removed during merging process. | Aleksandr Galiuzov | 2015-05-05 | 3 | -5/+22 | |
| |/ | | | | | | | | | The commit back this code in order to make sdl4.0 feature workable | |||||
* | | Merge branch 'hotfix/APPLINK-11991' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 3 | -1/+3 | |
|\ \ | ||||||
| * | | APPLINK-11991: Need to add KeyboardEvent for ENTRY_VOICE | Dmitriy Klimenko | 2015-05-04 | 3 | -1/+3 | |
| |/ | ||||||
* | | Merge branch 'hotfix/APPLINK-11782' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 19 | -105/+285 | |
|\ \ | ||||||
| * | | Remove PASA specific test methods | Dmitriy Klimenko | 2015-04-30 | 1 | -5/+0 | |
| | | | ||||||
| * | | Revert CMakeLists.txt | Dmitriy Klimenko | 2015-04-30 | 1 | -0/+0 | |
| | | | ||||||
| * | | Revert CMakeLists.txt | Dmitriy Klimenko | 2015-04-30 | 1 | -0/+682 | |
| | | | ||||||
| * | | APPLINK-12266: OnAppRegistered: SDL must provide the transport type ↵ | Alexandr Galiuzov | 2015-04-30 | 12 | -18/+123 | |
| | | | | | | | | | | | | information; Build fix | |||||
| * | | APPLINK-11782: OnAppRegistered: SDL must provide the transport type information | Dmitriy Klimenko | 2015-04-30 | 9 | -774/+172 | |
| |/ | | | | | | | | | | | | | | | Conflicts: src/components/application_manager/src/message_helper.cc src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h src/components/interfaces/HMI_API.xml src/components/transport_manager/test/include/mock_transport_adapter.h | |||||
* | | Merge branch 'hotfix/AlertManeuver_appID_and_type_addition' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 3 | -1/+12 | |
|\ \ | ||||||
| * | | Added same changes to QT_HMI. | Andrey Oleynik | 2015-04-28 | 1 | -0/+4 | |
| | | | ||||||
| * | | APPLINK-12586. HMI API changed for AlertManeuver. TTS.Speak will include ↵ | Andrey Oleynik | 2015-04-28 | 2 | -1/+8 | |
| |/ | | | | | | | appropriate type. | |||||
* | | Merge branch 'hotfix/AllowStresamingBeforeHMIResponse' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 10 | -152/+222 | |
|\ \ | ||||||
| * | | Remove Video stream retry timer, move logic to request. | Alexander Kutsan | 2015-04-27 | 7 | -69/+101 | |
| | | | ||||||
| * | | Remove AudioStreamRetryTimer, move logic to request | Alexander Kutsan | 2015-04-27 | 6 | -44/+67 | |
| | | | ||||||
| * | | Rename some methods for better understanting | Alexander Kutsan | 2015-04-27 | 8 | -39/+39 | |
| | | | | | | | | | | | | | | | Conflicts: src/components/application_manager/src/application_manager_impl.cc | |||||
| * | | Allow streaming before HMI response | Alexander Kutsan | 2015-04-27 | 4 | -20/+35 | |
| |/ | ||||||
* | | Merge branch 'hotfix/Subscribe_buttons_after_resumption' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 3 | -4/+74 | |
|\ \ | ||||||
| * | | Post review changes. | Artem Nosach | 2015-04-27 | 3 | -32/+50 | |
| | | | ||||||
| * | | Add SendOnSubscribeButtonNotifications() to MessageHelper. | Artem Nosach | 2015-04-27 | 3 | -4/+56 | |
| |/ | ||||||
* | | Merge branch 'hotfix/Enable_SDL_4_0_flag' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Enable SDL 4.0 flag. | Artem Nosach | 2015-04-27 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge branch 'hotfix/APPLINK-12807' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | APPLINK-12807. Fixed sending BC.ActivateApp to HMI for revoked app. | Andrey Oleynik | 2015-04-24 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge branch 'hotfix/APPLINK-12799' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 1 | -4/+11 | |
|\ \ | ||||||
| * | | HU: SDL does not select HmiZoneCapabilities from hmi_capabilities.json to ↵ | Dmitriy Klimenko | 2015-04-24 | 1 | -4/+11 | |
| |/ | | | | | | | send it in RAI response | |||||
* | | Merge branch 'hotfix/Set_attenuated_audio_state' into release/4.0.0 | Aleksandr Galiuzov | 2015-06-12 | 1 | -4/+8 | |
|\ \ | ||||||
| * | | Set ATTENUATED audio state only if current state is AUDIBLE. | Artem Nosach | 2015-04-24 | 1 | -4/+8 | |
| |/ |