aboutsummaryrefslogtreecommitdiffstats
path: root/parameter/SelectionCriterionType.cpp
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/SelectionCriterionType.cpp
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/SelectionCriterionType.cpp')
-rw-r--r--parameter/SelectionCriterionType.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/parameter/SelectionCriterionType.cpp b/parameter/SelectionCriterionType.cpp
index e2da080..6e5a8cc 100644
--- a/parameter/SelectionCriterionType.cpp
+++ b/parameter/SelectionCriterionType.cpp
@@ -41,7 +41,7 @@ bool CSelectionCriterionType::addValuePair(int iValue, const string& strValue)
// Check 1 bit set only for inclusive types
if (_bInclusive && (!iValue || (iValue & (iValue - 1)))) {
- log("Rejecting value pair association: 0x%X - %s for Selection Criterion Type %s", iValue, strValue.c_str(), getName().c_str());
+ log_warning("Rejecting value pair association: 0x%X - %s for Selection Criterion Type %s", iValue, strValue.c_str(), getName().c_str());
return false;
}
@@ -49,7 +49,7 @@ bool CSelectionCriterionType::addValuePair(int iValue, const string& strValue)
// Check already inserted
if (_numToLitMap.find(strValue) != _numToLitMap.end()) {
- log("Rejecting value pair association (literal already present): 0x%X - %s for Selection Criterion Type %s", iValue, strValue.c_str(), getName().c_str());
+ log_warning("Rejecting value pair association (literal already present): 0x%X - %s for Selection Criterion Type %s", iValue, strValue.c_str(), getName().c_str());
return false;
}