summaryrefslogtreecommitdiff
path: root/src/components/application_manager/include/application_manager/application_impl.h
diff options
context:
space:
mode:
authorShobhit Adlakha <ShobhitAd@users.noreply.github.com>2022-10-26 11:34:13 -0400
committerGitHub <noreply@github.com>2022-10-26 11:34:13 -0400
commit7343fc72c12edc8ac42a62556c9e4b29c9408bc3 (patch)
tree32e910f5440c10b384bb26b5555ac7adb77540ee /src/components/application_manager/include/application_manager/application_impl.h
parent65947fd1eb30a392948d67003df0fe803c070c6b (diff)
parentfb05c085b449b2149f85338fd4d00951205ab969 (diff)
downloadsdl_core-master.tar.gz
Merge pull request #3949 from smartdevicelink/release/8.2.0HEAD8.2.0masterdevelop
Release 8.2.0
Diffstat (limited to 'src/components/application_manager/include/application_manager/application_impl.h')
-rw-r--r--src/components/application_manager/include/application_manager/application_impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index 49f44acacb..1746893be3 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -555,7 +555,7 @@ class ApplicationImpl : public virtual Application,
*/
bool RemoveExtension(AppExtensionUID uid) OVERRIDE;
- const std::list<AppExtensionPtr>& Extensions() const OVERRIDE;
+ const DataAccessor<std::list<AppExtensionPtr> > Extensions() const OVERRIDE;
std::string hash_val_;
uint32_t grammar_id_;
@@ -617,6 +617,7 @@ class ApplicationImpl : public virtual Application,
Timer audio_stream_suspend_timer_;
std::list<AppExtensionPtr> extensions_;
+ mutable std::shared_ptr<sync_primitives::RecursiveLock> extensions_lock_;
// Cloud app properties
std::string endpoint_;
@@ -644,7 +645,6 @@ class ApplicationImpl : public virtual Application,
CommandSoftButtonID cmd_softbuttonid_;
// Lock for command soft button id
sync_primitives::Lock cmd_softbuttonid_lock_;
- mutable std::shared_ptr<sync_primitives::Lock> vi_lock_ptr_;
mutable std::shared_ptr<sync_primitives::Lock> button_lock_ptr_;
std::string folder_name_;
ApplicationManager& application_manager_;