From 3adb785eb097028750fc1b4c5ecab3bebf1a9ae3 Mon Sep 17 00:00:00 2001 From: Guillaume Denneulin Date: Tue, 8 Jul 2014 09:11:22 +0200 Subject: Move element tree initialisation to load function BZ: 207091 The parameter platform manager used to initialize the element tree. However, this is too early for plugins, since they need information from the core which have not been initialized yet. This patch delays the initialization of the element tree by adding it to the load() function of the ParameterMgr. Change-Id: I98e0e3a20ac0af2736eddc4c8349911eb1d1a691 Signed-off-by: Guillaume Denneulin Signed-off-by: Mattijs Korpershoek Reviewed-on: https://android.intel.com/215426 Reviewed-by: De Chivre, Renaud Reviewed-by: Benavoli, Patrick Reviewed-by: Rocard, KevinX Tested-by: Rocard, KevinX --- parameter/ParameterMgr.cpp | 6 ++++++ parameter/ParameterMgrPlatformConnector.cpp | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp index 4b8bdf6..d112461 100644 --- a/parameter/ParameterMgr.cpp +++ b/parameter/ParameterMgr.cpp @@ -454,6 +454,12 @@ bool CParameterMgr::load(string& strError) return false; } + // Init flow of element tree + if (!init(strError)) { + + return false; + } + // Back synchronization for areas in parameter blackboard not covered by any domain CBackSynchronizer* pBackSynchronizer = createBackSynchronizer(); diff --git a/parameter/ParameterMgrPlatformConnector.cpp b/parameter/ParameterMgrPlatformConnector.cpp index f29c8a8..d49003d 100644 --- a/parameter/ParameterMgrPlatformConnector.cpp +++ b/parameter/ParameterMgrPlatformConnector.cpp @@ -175,12 +175,6 @@ bool CParameterMgrPlatformConnector::start(string& strError) return false; } - // Init flow - if (!_pParameterMgr->init(strError)) { - - return false; - } - _bStarted = true; return true; -- cgit v1.1