diff options
author | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
---|---|---|
committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
commit | 46ed776c537131e72747538488b213cf45f23e22 (patch) | |
tree | 4cad1abf411addfd72ab591c93edeb5d225d9a39 /src/components/application_manager/test/mock/include/application_manager/application_impl.h | |
parent | a24079cb8de5563376dcf782cdb9fe3cae063841 (diff) | |
download | sdl_core-46ed776c537131e72747538488b213cf45f23e22.tar.gz |
Latest internal release - last bulk merge before pull request and gitflow!?
Smoke tested on Ubuntu 12.04
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/components/application_manager/test/mock/include/application_manager/application_impl.h')
-rw-r--r-- | src/components/application_manager/test/mock/include/application_manager/application_impl.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_impl.h index fda0837d6b..dadfce0929 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/application_impl.h @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -71,11 +71,6 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, void CloseActiveMessage(); bool IsFullscreen() const; bool MakeFullscreen(); - - /** - * @brief change supporting COMMUNICATION NAVIGATION - */ - virtual void ChangeSupportingAppHMIType(); bool IsAudible() const; void MakeNotAudible(); @@ -156,6 +151,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, virtual uint32_t nextHash(); virtual uint32_t curHash() const; + /** * @brief Change Hash for current application * and send notification to mobile @@ -235,6 +231,7 @@ class ApplicationImpl : public virtual InitialApplicationDataImpl, UsageStatistics usage_report_; ProtocolVersion protocol_version_; bool is_voice_communication_application_; + // NAVI retry stream volatile bool is_video_stream_retry_active_; volatile bool is_audio_stream_retry_active_; |