diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-02 15:28:08 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-02 17:46:01 -0400 |
| commit | 38e54fb36d40e9c8d147c9ab6113d29ca4481b3e (patch) | |
| tree | 9b8b730b86f530d9d1764cf8459c2b7aed8ef7a6 /src/components/application_manager/include/application_manager/commands/command.h | |
| parent | 1f3a2e49b0b0a6254ca6e8b003784b43bd1488d0 (diff) | |
| parent | ba1da7bc2ff3fd37638620f6bea526384646ab0e (diff) | |
| download | sdl_core-38e54fb36d40e9c8d147c9ab6113d29ca4481b3e.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/handling_VR_help_requests
# Conflicts:
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
# src/components/application_manager/src/application_manager_impl.cc
# src/components/application_manager/test/CMakeLists.txt
# src/components/application_manager/test/application_manager_impl_test.cc
# src/components/application_manager/test/resumption/resume_ctrl_test.cc
# src/components/functional_module/test/include/mock_application.h
# src/components/remote_control/test/include/mock_application.h
Diffstat (limited to 'src/components/application_manager/include/application_manager/commands/command.h')
| -rw-r--r-- | src/components/application_manager/include/application_manager/commands/command.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h index cc090defa0..6524799f45 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -113,7 +113,7 @@ class Command { */ virtual void SetAllowedToTerminate(const bool allowed) = 0; - enum CommandOrigin { ORIGIN_SDL, ORIGIN_MOBILE }; + enum CommandSource { SOURCE_SDL, SOURCE_MOBILE, SOURCE_HMI }; }; typedef smart_objects::SmartObjectSPtr MessageSharedPtr; |