From 9620e44c6c7605bf589f60331eb5b05b71336853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Boisnard?= Date: Wed, 30 May 2012 16:15:02 +0200 Subject: PFW: Fixed bug on BitParameterTypes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BZ: 44148 The save and restore operation would not work correctly when BitParameters of a BitParameterBlock were used in more than a single Domain. This patch aims to fixup this bug and introduces a new class: BitwiseAreaConfiguration. Change-Id: I0aaccd57cf1cce33400f94a8879565171d283425 Orig-Change-Id: I7107f7db9f01cfff3c38cbac606a8c1e9bca8b5e Signed-off-by: Frédéric Boisnard Reviewed-on: http://android.intel.com:8080/58363 Reviewed-by: Mendi, EduardoX Tested-by: Mendi, EduardoX Reviewed-by: buildbot Tested-by: buildbot --- parameter/DomainConfiguration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parameter/DomainConfiguration.cpp') diff --git a/parameter/DomainConfiguration.cpp b/parameter/DomainConfiguration.cpp index f746be9..9e341f2 100644 --- a/parameter/DomainConfiguration.cpp +++ b/parameter/DomainConfiguration.cpp @@ -212,7 +212,7 @@ bool CDomainConfiguration::serializeConfigurableElementSettings(CAreaConfigurati // Configurable Elements association void CDomainConfiguration::addConfigurableElement(const CConfigurableElement* pConfigurableElement, const CSyncerSet* pSyncerSet) { - CAreaConfiguration* pAreaConfiguration = new CAreaConfiguration(pConfigurableElement, pSyncerSet); + CAreaConfiguration* pAreaConfiguration = pConfigurableElement->createAreaConfiguration(pSyncerSet); _areaConfigurationList.push_back(pAreaConfiguration); _orderedAreaConfigurationList.push_back(pAreaConfiguration); @@ -433,7 +433,7 @@ void CDomainConfiguration::merge(CConfigurableElement* pToConfigurableElement, C const CAreaConfiguration* pAreaConfigurationToMergeFrom = getAreaConfiguration(pFromConfigurableElement); // Do the merge - pAreaConfigurationToMergeTo->copyFromInner(pAreaConfigurationToMergeFrom); + pAreaConfigurationToMergeFrom->copyToOuter(pAreaConfigurationToMergeTo); } // Domain splitting @@ -454,7 +454,7 @@ void CDomainConfiguration::split(CConfigurableElement* pFromConfigurableElement) CAreaConfiguration* pChildAreaConfiguration = getAreaConfiguration(pToChildConfigurableElement); // Do the copy - pAreaConfigurationToSplitFrom->copyToInner(pChildAreaConfiguration); + pChildAreaConfiguration->copyFromOuter(pAreaConfigurationToSplitFrom); } } -- cgit v1.1