commit 170f0a44b8309a954cd4802e85ac3dd6944a35fa
author Kevin Rocard <kevinx.rocard@intel.com> Mon Jun 18 13:56:05 2012 +0200
committer David Wagner <david.wagner@intel.com> Wed Feb 12 17:03:10 2014 +0100
tree 3b24f1b914424c623a8dc318863e23c41376d8e6
parent a2a91058deb15b21baed892e2e27cb2d49e824ed

PFW: Add a command to delete all domains

BZ: 42432

This command is useful to reset all PFW settings.
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>

Change-Id: I23b74c45205739aeca71278979699b6b88f3111e
Reviewed-on: http://android.intel.com:8080/53332
Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com>
Tested-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

parameter/ConfigurableDomains.cpp

diff --git a/parameter/ConfigurableDomains.cpp b/parameter/ConfigurableDomains.cpp
index 28611d3..706767b 100644
--- a/parameter/ConfigurableDomains.cpp
+++ b/parameter/ConfigurableDomains.cpp
@@ -157,6 +157,14 @@
     return true;
 }
 
+void CConfigurableDomains::deleteAllDomains()
+{
+    log("Deleting all configurable domains");
+
+    //remove Children
+    clean();
+}
+
 bool CConfigurableDomains::renameDomain(const string& strName, const string& strNewName, string& strError)
 {
     CConfigurableDomain* pConfigurableDomain = findConfigurableDomain(strName, strError);

parameter/ConfigurableDomains.h

diff --git a/parameter/ConfigurableDomains.h b/parameter/ConfigurableDomains.h
index 262d900..bafcbfb 100644
--- a/parameter/ConfigurableDomains.h
+++ b/parameter/ConfigurableDomains.h
@@ -48,6 +48,7 @@
     /// Domains
     bool createDomain(const string& strName, string& strError);
     bool deleteDomain(const string& strName, string& strError);
+    void deleteAllDomains();
     bool renameDomain(const string& strName, const string& strNewName, string& strError);
     bool setSequenceAwareness(const string& strDomain, bool bSequenceAware, string& strError);
     bool getSequenceAwareness(const string& strDomain, bool& bSequenceAware, string& strError) const;

parameter/ParameterMgr.cpp

diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
index dc38f95..c1538df 100644
--- a/parameter/ParameterMgr.cpp
+++ b/parameter/ParameterMgr.cpp
@@ -132,6 +132,7 @@
     { "dumpDomains", &CParameterMgr::dumpDomainsCommmandProcess, 0, "", "Show all domains and configurations, including applicability conditions" },
     { "createDomain", &CParameterMgr::createDomainCommmandProcess, 1, "<domain>", "Create new configurable domain" },
     { "deleteDomain", &CParameterMgr::deleteDomainCommmandProcess, 1, "<domain>", "Delete configurable domain" },
+    { "deleteAllDomains", &CParameterMgr::deleteAllDomainsCommmandProcess, 0, "", "Delete all configurable domains" },
     { "renameDomain", &CParameterMgr::renameDomainCommmandProcess, 2, "<domain> <new name>", "Rename configurable domain" },
     { "setSequenceAwareness", &CParameterMgr::setSequenceAwarenessCommmandProcess, 1, "<domain> true|false*", "Set configurable domain sequence awareness" },
     { "getSequenceAwareness", &CParameterMgr::getSequenceAwarenessCommmandProcess, 1, "<domain>", "Get configurable domain sequence awareness" },
@@ -872,6 +873,13 @@
     return deleteDomain(remoteCommand.getArgument(0), strResult) ? CCommandHandler::EDone : CCommandHandler::EFailed;
 }
 
+CParameterMgr::CCommandHandler::CommandStatus CParameterMgr::deleteAllDomainsCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult)
+{
+    (void)remoteCommand;
+
+    return deleteAllDomains(strResult) ? CCommandHandler::EDone : CCommandHandler::EFailed;
+}
+
 CParameterMgr::CCommandHandler::CommandStatus CParameterMgr::renameDomainCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult)
 {
     return getConfigurableDomains()->renameDomain(remoteCommand.getArgument(0), remoteCommand.getArgument(1), strResult) ? CCommandHandler::EDone : CCommandHandler::EFailed;
@@ -1447,6 +1455,20 @@
     return getConfigurableDomains()->deleteDomain(strName, strError);
 }
 
+bool CParameterMgr::deleteAllDomains(string& strError)
+{
+    // Check tuning mode
+    if (!checkTuningModeOn(strError)) {
+
+        return false;
+    }
+
+    // Delegate to configurable domains
+    getConfigurableDomains()->deleteAllDomains();
+
+    return true;
+}
+
 bool CParameterMgr::createConfiguration(const string& strDomain, const string& strConfiguration, string& strError)
 {
     // Check tuning mode

parameter/ParameterMgr.h

diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
index 1a5ebf2..a694bf4 100644
--- a/parameter/ParameterMgr.h
+++ b/parameter/ParameterMgr.h
@@ -144,6 +144,7 @@
     // Creation/Deletion
     bool createDomain(const string& strName, string& strError);
     bool deleteDomain(const string& strName, string& strError);
+    bool deleteAllDomains(string& strError);
     bool createConfiguration(const string& strDomain, const string& strConfiguration, string& strError);
     bool deleteConfiguration(const string& strDomain, const string& strConfiguration, string& strError);
 
@@ -202,6 +203,7 @@
     CCommandHandler::CommandStatus listDomainsCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
     CCommandHandler::CommandStatus createDomainCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
     CCommandHandler::CommandStatus deleteDomainCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
+    CCommandHandler::CommandStatus deleteAllDomainsCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
     CCommandHandler::CommandStatus renameDomainCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
     CCommandHandler::CommandStatus setSequenceAwarenessCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);
     CCommandHandler::CommandStatus getSequenceAwarenessCommmandProcess(const IRemoteCommand& remoteCommand, string& strResult);