commit 082dd4728914bae6d6cb70e74c8cffa5155082a3
author Patrick Benavoli <patrickx.benavoli@intel.com> Mon Nov 07 19:46:00 2011 +0100
committer David Wagner <david.wagner@intel.com> Mon Feb 10 17:14:59 2014 +0100
tree cbc41110d8784450e9bd63227c557e1c279a2911
parent d3a86bf6c46db222b0afadc7899c25e1a6e015fb

PFW: selection criteria rule constraints

BZ: 13907

Selection criteria rules' constraints previously applied
on the inclusive type of criteria while those should support
all kinds of predicates. Now inclusive types support all
predicates and exclusive ones support only identity predicates.

Change-Id: If5d9d4bd338748950eb4927d833d9d3da7ad48ee
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/25402
Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

parameter/SelectionCriterionRule.cpp

diff --git a/parameter/SelectionCriterionRule.cpp b/parameter/SelectionCriterionRule.cpp
index eec88be..bb353bd 100644
--- a/parameter/SelectionCriterionRule.cpp
+++ b/parameter/SelectionCriterionRule.cpp
@@ -38,10 +38,10 @@
 #define base CRule
 
 const CSelectionCriterionRule::SMatchingRuleDescription CSelectionCriterionRule::_astMatchesWhen[CSelectionCriterionRule::ENbMatchesWhen] = {
-    { "Is", false },
-    { "IsNot", false },
-    { "Includes", true },
-    { "Excludes", true }
+    { "Is", true },
+    { "IsNot", true },
+    { "Includes", false },
+    { "Excludes", false }
 };
 
 CSelectionCriterionRule::CSelectionCriterionRule() : _pSelectionCriterion(NULL), _eMatchesWhen(CSelectionCriterionRule::EIs), _iMatchValue(0)
@@ -156,9 +156,9 @@
             const ISelectionCriterionTypeInterface* pSelectionCriterionType = _pSelectionCriterion->getCriterionType();
 
             // Check compatibility if relevant
-            if (pSelectionCriterionType->isTypeInclusive() && !pstMatchingRuleDescription->bInclusiveTypeCompatible) {
+            if (!pSelectionCriterionType->isTypeInclusive() && !pstMatchingRuleDescription->bExclusiveTypeCompatible) {
 
-                strError = "Value incompatible with inclusive kind of type";
+                strError = "Value incompatible with exclusive kind of type";
 
                 return false;
             }