commit d3a86bf6c46db222b0afadc7899c25e1a6e015fb
author Patrick Benavoli <patrickx.benavoli@intel.com> Mon Nov 07 19:33:30 2011 +0100
committer David Wagner <david.wagner@intel.com> Mon Feb 10 17:14:58 2014 +0100
tree b4d633248380c7f199339f32e3fd3523d3faef54
parent 5901c1d3f448af5d0506d889b0543d9e0de0c2ce

PFW: Mapping optimization

BZ: 13906

As soon as a subsystem object is created, the mapping process
ceases to go deeper and explores other branches of the
parameter tree.
Adaptation to ICS environment in mk files

Change-Id: I5cdf3ea3829f59379804aa88be282b1128c598b0
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/25401
Reviewed-by: De Chivre, RenaudX <renaudx.de.chivre@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

parameter/InstanceConfigurableElement.cpp

diff --git a/parameter/InstanceConfigurableElement.cpp b/parameter/InstanceConfigurableElement.cpp
index f35be87..6d6526e 100644
--- a/parameter/InstanceConfigurableElement.cpp
+++ b/parameter/InstanceConfigurableElement.cpp
@@ -68,10 +68,17 @@
     // Begin
     if (bHasMappingData) {
 
-        if (!mapper.mapBegin(this, strError)) {
+        bool bKeepDiving;
+
+        if (!mapper.mapBegin(this, bKeepDiving, strError)) {
 
             return false;
         }
+        // Go on through children?
+        if (!bKeepDiving) {
+
+            return true;
+        }
     }
 
     // Map children