From ace81f873b910493ab884dc5a6a38ba6ec3d56d3 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 11 Dec 2012 16:19:17 +0100 Subject: PFW: Do not stop on hard sync errors BZ: 76263 When synchronization fails, the parameter-framework should log a warning and continue synchronization instead of stopping Change-Id: Ic12d8798ea25584db714ee26e644fac793c28881 Signed-off-by: Kevin Rocard Reviewed-on: http://android.intel.com:8080/81825 Reviewed-by: Centelles, Sylvain Reviewed-by: Denneulin, Guillaume Tested-by: Dixon, CharlesX Reviewed-by: cactus Tested-by: cactus --- parameter/ConfigurableDomain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'parameter/ConfigurableDomain.h') diff --git a/parameter/ConfigurableDomain.h b/parameter/ConfigurableDomain.h index 29e92cb..46d33d7 100644 --- a/parameter/ConfigurableDomain.h +++ b/parameter/ConfigurableDomain.h @@ -51,7 +51,7 @@ public: bool createConfiguration(const string& strName, const CParameterBlackboard* pMainBlackboard, string& strError); bool deleteConfiguration(const string& strName, string& strError); bool renameConfiguration(const string& strName, const string& strNewName, string& strError); - bool restoreConfiguration(const string& strName, CParameterBlackboard* pMainBlackboard, bool bAutoSync, string& strError) const; + bool restoreConfiguration(const string& strName, CParameterBlackboard* pMainBlackboard, bool bAutoSync, list& strError) const; bool saveConfiguration(const string& strName, const CParameterBlackboard* pMainBlackboard, string& strError); bool setElementSequence(const string& strConfiguration, const vector& astrNewElementSequence, string& strError); bool getElementSequence(const string& strConfiguration, string& strResult) const; @@ -80,7 +80,7 @@ public: void validate(const CParameterBlackboard* pMainBlackboard); // Configuration application if required - bool apply(CParameterBlackboard* pParameterBlackboard, CSyncerSet& syncerSet, bool bForced, string& strError) const; + void apply(CParameterBlackboard* pParameterBlackboard, CSyncerSet& syncerSet, bool bForced) const; // Return applicable configuration validity for given configurable element bool isApplicableConfigurationValid(const CConfigurableElement* pConfigurableElement) const; -- cgit v1.1