summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorKevin Rocard <kevinx.rocard@intel.com>2013-01-21 15:57:45 +0100
committerDavid Wagner <david.wagner@intel.com>2014-02-12 17:03:32 +0100
commit5d6e05ab8d9ecc00d4542a0d76bd1ad9bd7ff88c (patch)
tree5a750e442f037e418df36d7358412c97426775b2 /parameter
parent326e39e42a801bff4b61655ebc0e3ff759c208ff (diff)
downloadexternal_parameter-framework-5d6e05ab8d9ecc00d4542a0d76bd1ad9bd7ff88c.zip
external_parameter-framework-5d6e05ab8d9ecc00d4542a0d76bd1ad9bd7ff88c.tar.gz
external_parameter-framework-5d6e05ab8d9ecc00d4542a0d76bd1ad9bd7ff88c.tar.bz2
PFW: Back synchronisation no longer fails
BZ: 80500 As forward synchronisation, back synchronisation no longer return false if a syncer fails to backsynchronise. On subsystem restart, it will be resynchronise, so the back synchronisation failure is a warning not an error. As a result this patch also prevents PFW initialisation failure in case of unavailable subsystem. Change-Id: I21fe05747153a63cb77ed784532f3cbbf184d820 Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com> Reviewed-on: http://android.intel.com:8080/87779 Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com> Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com> Reviewed-by: Benavoli, Patrick <patrick.benavoli@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com>
Diffstat (limited to 'parameter')
-rw-r--r--parameter/BackSynchronizer.h2
-rw-r--r--parameter/HardwareBackSynchronizer.cpp4
-rw-r--r--parameter/HardwareBackSynchronizer.h2
-rw-r--r--parameter/ParameterMgr.cpp8
-rw-r--r--parameter/SimulatedBackSynchronizer.cpp3
-rw-r--r--parameter/SimulatedBackSynchronizer.h2
6 files changed, 7 insertions, 14 deletions
diff --git a/parameter/BackSynchronizer.h b/parameter/BackSynchronizer.h
index 87e0515..2c3cdac 100644
--- a/parameter/BackSynchronizer.h
+++ b/parameter/BackSynchronizer.h
@@ -37,7 +37,7 @@ public:
CBackSynchronizer(const CConfigurableElement* pConfigurableElement);
// Back synchronization
- virtual bool sync() = 0;
+ virtual void sync() = 0;
protected:
// Aggegate list
diff --git a/parameter/HardwareBackSynchronizer.cpp b/parameter/HardwareBackSynchronizer.cpp
index 7b09baa..661ec45 100644
--- a/parameter/HardwareBackSynchronizer.cpp
+++ b/parameter/HardwareBackSynchronizer.cpp
@@ -42,8 +42,8 @@ CHardwareBackSynchronizer::CHardwareBackSynchronizer(const CConfigurableElement*
}
// Back synchronization
-bool CHardwareBackSynchronizer::sync()
+void CHardwareBackSynchronizer::sync()
{
// Perform back synchronization
- return _backSyncerSet.sync(*_pParameterBlackboard, true, NULL);
+ _backSyncerSet.sync(*_pParameterBlackboard, true, NULL);
}
diff --git a/parameter/HardwareBackSynchronizer.h b/parameter/HardwareBackSynchronizer.h
index 2f0d503..094da14 100644
--- a/parameter/HardwareBackSynchronizer.h
+++ b/parameter/HardwareBackSynchronizer.h
@@ -33,7 +33,7 @@ public:
CHardwareBackSynchronizer(const CConfigurableElement* pConfigurableElement, CParameterBlackboard* pParameterBlackboard);
// Back synchronization
- virtual bool sync();
+ virtual void sync();
private:
// Back syncer set
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
index 484687a..90d7884 100644
--- a/parameter/ParameterMgr.cpp
+++ b/parameter/ParameterMgr.cpp
@@ -337,14 +337,8 @@ bool CParameterMgr::load(string& strError)
{
CAutoLog autoLog(this, "Main blackboard back synchronization");
- if (!pBackSynchronizer->sync()) {
- // Get rid of back synchronizer
- delete pBackSynchronizer;
+ pBackSynchronizer->sync();
- strError = "Main blackboard back synchronization failed";
-
- return false;
- }
// Get rid of back synchronizer
delete pBackSynchronizer;
}
diff --git a/parameter/SimulatedBackSynchronizer.cpp b/parameter/SimulatedBackSynchronizer.cpp
index bb0d0fb..325b9e3 100644
--- a/parameter/SimulatedBackSynchronizer.cpp
+++ b/parameter/SimulatedBackSynchronizer.cpp
@@ -34,7 +34,7 @@ CSimulatedBackSynchronizer::CSimulatedBackSynchronizer(const CConfigurableElemen
}
// Back synchronization
-bool CSimulatedBackSynchronizer::sync()
+void CSimulatedBackSynchronizer::sync()
{
// Set default values to simulate back synchronization
list<const CConfigurableElement*>::const_iterator it;
@@ -45,5 +45,4 @@ bool CSimulatedBackSynchronizer::sync()
pConfigurableElement->setDefaultValues(_parameterAccessContext);
}
- return true;
}
diff --git a/parameter/SimulatedBackSynchronizer.h b/parameter/SimulatedBackSynchronizer.h
index 2500be2..aa38a68 100644
--- a/parameter/SimulatedBackSynchronizer.h
+++ b/parameter/SimulatedBackSynchronizer.h
@@ -35,7 +35,7 @@ public:
CSimulatedBackSynchronizer(const CConfigurableElement* pConfigurableElement, CParameterBlackboard* pParameterBlackboard);
// Back synchronization
- virtual bool sync();
+ virtual void sync();
private:
// Fake error for parameter context creation
string _strError;