summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Denneulin <guillaume.denneulin@intel.com>2014-07-08 09:11:22 +0200
committerPhilippe Afonso <philippex.afonso@intel.com>2015-01-29 11:31:39 +0100
commit3adb785eb097028750fc1b4c5ecab3bebf1a9ae3 (patch)
tree436ccad09dd3b85f53580afc1eab32162206327a
parent2416d7a8b51e9d713d7741eaaaeb357b532ae9a8 (diff)
downloadexternal_parameter-framework-3adb785eb097028750fc1b4c5ecab3bebf1a9ae3.zip
external_parameter-framework-3adb785eb097028750fc1b4c5ecab3bebf1a9ae3.tar.gz
external_parameter-framework-3adb785eb097028750fc1b4c5ecab3bebf1a9ae3.tar.bz2
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 <guillaume.denneulin@intel.com> Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com> Reviewed-on: https://android.intel.com/215426 Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com> Reviewed-by: Benavoli, Patrick <patrick.benavoli@intel.com> Reviewed-by: Rocard, KevinX <kevinx.rocard@intel.com> Tested-by: Rocard, KevinX <kevinx.rocard@intel.com>
-rw-r--r--parameter/ParameterMgr.cpp6
-rw-r--r--parameter/ParameterMgrPlatformConnector.cpp6
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;