commit 7f26582e6a732524231af95aefab829c9f0b92d2
author Kevin Rocard <kevinx.rocard@intel.com> Fri Dec 07 18:51:22 2012 +0100
committer David Wagner <david.wagner@intel.com> Wed Feb 12 17:03:31 2014 +0100
tree c28f57f793309aa1f9e34a841c5d64c4534c3c77
parent f2fd15a331fd3b5b63f0dc6f492651330adcedf9

PFW: Log criterion state at PFW start

BZ: 77959

The PFW will log criterion patch state at start before appling
configuration.

Change-Id: I4ac3676b9ba685c1e226a8495ffdbe98f0c08219
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Reviewed-on: http://android.intel.com:8080/79965
Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com>
Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>

parameter/ParameterMgr.cpp

diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
index 4116dbe..484687a 100644
--- a/parameter/ParameterMgr.cpp
+++ b/parameter/ParameterMgr.cpp
@@ -355,6 +355,21 @@
     // We need to ensure all domains are valid
     pConfigurableDomains->validate(_pMainParameterBlackboard);
 
+    // Log selection criterion states
+    {
+        CAutoLog autoLog(this, "Criterion states");
+
+        const CSelectionCriteria* selectionCriteria = getConstSelectionCriteria();
+
+        list<string> lstrSelectionCriteron;
+        selectionCriteria->listSelectionCriteria(lstrSelectionCriteron, true, false);
+
+        string strSelectionCriteron;
+        CUtility::concatenate(lstrSelectionCriteron, strSelectionCriteron);
+
+        log_info("%s", strSelectionCriteron.c_str());
+    }
+
     // At initialization, check subsystems that need resync
     doApplyConfigurations(true);
 
@@ -673,9 +688,10 @@
 
     /// Criteria states
     appendTitle(strResult, "Selection Criteria:");
-    string strSelectionCriteria;
-    getSelectionCriteria()->listSelectionCriteria(strSelectionCriteria, false);
-    strResult += strSelectionCriteria;
+    list<string> lstrSelectionCriteria;
+    getSelectionCriteria()->listSelectionCriteria(lstrSelectionCriteria, false, true);
+    // Concatenate the criterion list as the command result
+    CUtility::concatenate(lstrSelectionCriteria, strResult);
 
     return CCommandHandler::ESucceeded;
 }
@@ -820,7 +836,12 @@
 {
     (void)remoteCommand;
 
-    getSelectionCriteria()->listSelectionCriteria(strResult, true);
+    list<string> lstrResult;
+
+    getSelectionCriteria()->listSelectionCriteria(lstrResult, true, true);
+
+    // Concatenate the criterion list as the command result
+    CUtility::concatenate(lstrResult, strResult);
 
     return CCommandHandler::ESucceeded;
 }