SDL transfer PlayTone parameter to HMI in speak request.

Added ability to remove fake parameter according with
MOBILE_API.xml

Closes-bug:[APPLINK-17980](https://adc.luxoft.com/jira/browse/APPLINK-17980)

5 files changed, 26 insertions, 7 deletions

diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h
index f8fa8e9462..6454693b38 100644
--- a/src/components/smart_objects/include/smart_objects/array_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h
@@ -73,8 +73,11 @@ class CArraySchemaItem : public ISchemaItem {
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
+   *
+   * @param RemoveFakeParameters contains true if need to remove fake parameters
+   * from smart object otherwise contains false.
    **/
-  void applySchema(SmartObject& Object) OVERRIDE;
+  void applySchema(SmartObject& Object, const bool RemoveFakeParameters) OVERRIDE;
 
   /**
    * @brief Unapply schema.
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
index b38b910452..c303061152 100644
--- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
@@ -76,8 +76,10 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
    * and tries to convert it to integer according to element-to-string
    * map.
    * @param Object Object to apply schema.
+   * @param RemoveFakeParameters contains true if need to remove fake parameters
+   * from smart object otherwise contains false.
    **/
-  void applySchema(SmartObject& Object) OVERRIDE;
+  void applySchema(SmartObject& Object, const bool RemoveFakeParameters) OVERRIDE;
   /**
    * @brief Unapply schema.
    * @param Object Object to unapply schema.
@@ -214,7 +216,7 @@ Errors::eType TEnumSchemaItem<EnumType>::validate(const SmartObject& Object) {
 }
 
 template<typename EnumType>
-void TEnumSchemaItem<EnumType>::applySchema(SmartObject& Object) {
+void TEnumSchemaItem<EnumType>::applySchema(SmartObject& Object, const bool RemoveFakeParameters) {
   if (SmartType_String == Object.getType()) {
     EnumType enum_val = static_cast<EnumType>(-1);
     if (ConversionHelper::StringToEnum(Object.asString(), &enum_val)) {
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index b58414459d..6e16e6a2a2 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -93,8 +93,10 @@ class CObjectSchemaItem : public ISchemaItem {
   /**
    * @brief Apply schema.
    * @param Object Object to apply schema.
+   * @param RemoveFakeParameters contains true if need to remove fake parameters
+   * from smart object otherwise contains false.
    **/
-  void applySchema(SmartObject& Object) OVERRIDE;
+  void applySchema(SmartObject& Object, const bool RemoveFakeParameters) OVERRIDE;
   /**
    * @brief Unapply schema.
    * @param Object Object to unapply schema.
@@ -121,6 +123,13 @@ class CObjectSchemaItem : public ISchemaItem {
    *                describing the object member.
    **/
   CObjectSchemaItem(const Members& Members);
+
+  /**
+   * @brief Removes fake parameters from object.
+   * @param Object Object to remove fake parameters.
+   **/
+  void RemoveFakeParams(SmartObject& Object);
+
   /**
    * @brief Map of member name to SMember structure describing the object member.
    **/
diff --git a/src/components/smart_objects/include/smart_objects/schema_item.h b/src/components/smart_objects/include/smart_objects/schema_item.h
index 83adb0022b..92b1495909 100644
--- a/src/components/smart_objects/include/smart_objects/schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/schema_item.h
@@ -77,9 +77,11 @@ class ISchemaItem {
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
+   * @param RemoveFakeParameters contains true if need to remove fake parameters
+   * from smart object otherwise contains false.
    **/
-  virtual void applySchema(
-      NsSmartDeviceLink::NsSmartObjects::SmartObject& Object);
+  virtual void applySchema(NsSmartDeviceLink::NsSmartObjects::SmartObject& Object,
+                           const bool RemoveFakeParameters);
 
   /**
    * @brief Unapply schema.
diff --git a/src/components/smart_objects/include/smart_objects/smart_schema.h b/src/components/smart_objects/include/smart_objects/smart_schema.h
index 720bfc9012..52dfa12004 100644
--- a/src/components/smart_objects/include/smart_objects/smart_schema.h
+++ b/src/components/smart_objects/include/smart_objects/smart_schema.h
@@ -80,8 +80,11 @@ class CSmartSchema FINAL {
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
+   *
+   * @param RemoveFakeParameters contains true if need to remove fake parameters
+   * from smart object otherwise contains false.
    **/
-  void applySchema(SmartObject& Object);
+  void applySchema(SmartObject& Object, const bool RemoveFakeParameters);
 
   /**
    * @brief The reverse SmartObject conversion using schema.