summaryrefslogtreecommitdiffstats
path: root/parameter/ParameterMgr.h
diff options
context:
space:
mode:
authorKevin Rocard <kevinx.rocard@intel.com>2012-12-11 16:19:17 +0100
committerDavid Wagner <david.wagner@intel.com>2014-02-12 17:03:31 +0100
commitace81f873b910493ab884dc5a6a38ba6ec3d56d3 (patch)
tree0835bb56ade03f1bd98834f1aaf1abeca3c00459 /parameter/ParameterMgr.h
parent57096bd2de45c840090503d70f40b79565e38881 (diff)
downloadexternal_parameter-framework-ace81f873b910493ab884dc5a6a38ba6ec3d56d3.zip
external_parameter-framework-ace81f873b910493ab884dc5a6a38ba6ec3d56d3.tar.gz
external_parameter-framework-ace81f873b910493ab884dc5a6a38ba6ec3d56d3.tar.bz2
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 <kevinx.rocard@intel.com> Reviewed-on: http://android.intel.com:8080/81825 Reviewed-by: Centelles, Sylvain <sylvain.centelles@intel.com> Reviewed-by: Denneulin, Guillaume <guillaume.denneulin@intel.com> Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com>
Diffstat (limited to 'parameter/ParameterMgr.h')
-rw-r--r--parameter/ParameterMgr.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
index 78db932..7bbd2a2 100644
--- a/parameter/ParameterMgr.h
+++ b/parameter/ParameterMgr.h
@@ -25,13 +25,14 @@
#pragma once
#include <pthread.h>
+#include <map>
+#include <vector>
+#include <list>
#include "RemoteCommandHandlerTemplate.h"
#include "PathNavigator.h"
#include "SelectionCriterionType.h"
#include "SelectionCriterion.h"
#include "Element.h"
-#include <map>
-#include <vector>
#include "XmlDocSink.h"
#include "XmlDocSource.h"
@@ -89,7 +90,7 @@ public:
class ILogger
{
public:
- virtual void log(const std::string& strLog) = 0;
+ virtual void log(bool bIsWarning, const std::string& strLog) = 0;
};
// Construction
@@ -110,7 +111,7 @@ public:
CSelectionCriterion* getSelectionCriterion(const string& strName);
// Configuration application
- bool applyConfigurations(string& strError);
+ void applyConfigurations();
// Dynamic parameter handling
CParameterHandle* createParameterHandle(const string& strPath, string& strError);
@@ -145,7 +146,7 @@ public:
bool deleteConfiguration(const string& strDomain, const string& strConfiguration, string& strError);
// Save/Restore
- bool restoreConfiguration(const string& strDomain, const string& strConfiguration, string& strError);
+ bool restoreConfiguration(const string& strDomain, const string& strConfiguration, list<string>& strError);
bool saveConfiguration(const string& strDomain, const string& strConfiguration, string& strError);
// Configurable element - domain association
@@ -170,12 +171,13 @@ public:
// CElement
virtual string getKind() const;
+
private:
CParameterMgr(const CParameterMgr&);
CParameterMgr& operator=(const CParameterMgr&);
// Logging (done by root)
- virtual void doLog(const string& strLog) const;
+ virtual void doLog(bool bIsWarning, const string& strLog) const;
virtual void nestLog() const;
virtual void unnestLog() const;
@@ -304,7 +306,7 @@ private:
bool handleRemoteProcessingInterface(string& strError);
// Back synchronization
- CBackSynchronizer* createBackSynchronizer(string& strError) const;
+ CBackSynchronizer* createBackSynchronizer() const;
// Tuning
bool _bTuningModeIsOn;