Repair CMakeFile after merging master to develop

6 files changed, 3 insertions, 39 deletions

diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
index 775ed7f349..963899e809 100644
--- a/src/components/application_manager/CMakeLists.txt
+++ b/src/components/application_manager/CMakeLists.txt
@@ -297,7 +297,6 @@ file (GLOB MOBILE_COMMANDS_SOURCES
   ${AM_SOURCE_DIR}/src/commands/hmi/dial_number_request.cc
   ${AM_SOURCE_DIR}/src/commands/hmi/dial_number_response.cc
   ${AM_SOURCE_DIR}/src/commands/hmi/on_event_changed_notification.cc
-  ${AM_SOURCE_DIR}/src/commands/hmi/on_phone_call_notification.cc
 )
 
 set (HMI_COMMANDS_SOURCES_JSON
diff --git a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h
index c2ed6ee4ff..b628b4b85b 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/dial_number_request.h
@@ -60,12 +60,7 @@ class DialNumberRequest : public CommandRequestImpl {
    **/
    bool Init() OVERRIDE;
 
-  /**
-    * @brief Initialize request params
-   **/
-   virtual bool Init();
-
-  /**
+ /**
    * @brief Execute command
    **/
   void Run() OVERRIDE;
@@ -77,13 +72,6 @@ class DialNumberRequest : public CommandRequestImpl {
    */
   void on_event(const event_engine::Event& event);
 
-  /**
-   * @brief Interface method that is called whenever new event received
-   *
-   * @param event The received event
-   */
-  void on_event(const event_engine::Event& event);
-
  private:
 
   /**
diff --git a/src/components/application_manager/src/commands/mobile/system_request.cc b/src/components/application_manager/src/commands/mobile/system_request.cc
index bede5b3f3b..dc399c8bc3 100644
--- a/src/components/application_manager/src/commands/mobile/system_request.cc
+++ b/src/components/application_manager/src/commands/mobile/system_request.cc
@@ -48,9 +48,8 @@ Copyright (c) 2013, Ford Motor Company
 
 namespace application_manager {
 
-namespace {
-
 CREATE_LOGGERPTR_LOCAL(logger_, "ApplicationManager")
+namespace {
 
 const char* kQueryAppsValidationFailedPrefix =
     ":QUERY_APPS_VALIDATION_FAILED: ";
diff --git a/src/components/application_manager/src/hmi_command_factory.cc b/src/components/application_manager/src/hmi_command_factory.cc
index 31c8923790..2ec9de5970 100644
--- a/src/components/application_manager/src/hmi_command_factory.cc
+++ b/src/components/application_manager/src/hmi_command_factory.cc
@@ -262,13 +262,12 @@
 #include "application_manager/commands/hmi/navi_send_location_request.h"
 #include "application_manager/commands/hmi/navi_send_location_response.h"
 #include "application_manager/commands/hmi/on_tts_reset_timeout_notification.h"
-#include "application_manager/commands/hmi/on_phone_call_notification.h"
 #include "application_manager/commands/hmi/dial_number_request.h"
 #include "application_manager/commands/hmi/dial_number_response.h"
 
+CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
 namespace application_manager {
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
 
 CommandSharedPtr HMICommandFactory::CreateCommand(
     const commands::MessageSharedPtr& message) {
diff --git a/src/components/application_manager/src/mobile_command_factory.cc b/src/components/application_manager/src/mobile_command_factory.cc
index 3399ec2667..dc665bc28b 100644
--- a/src/components/application_manager/src/mobile_command_factory.cc
+++ b/src/components/application_manager/src/mobile_command_factory.cc
@@ -483,15 +483,6 @@ CommandSharedPtr MobileCommandFactory::CreateCommand(
     case mobile_apis::FunctionID::DialNumberID: {
       if ((*message)[strings::params][strings::message_type]
           == static_cast<int>(application_manager::MessageType::kResponse)) {
-        command = utils::MakeShared<commands::DialNumberResponse>(message);
-      } else {
-        command = utils::MakeShared<commands::DialNumberRequest>(message);
-      }
-      break;
-    }
-    case mobile_apis::FunctionID::DialNumberID: {
-      if ((*message)[strings::params][strings::message_type]
-          == static_cast<int>(application_manager::MessageType::kResponse)) {
         return  new commands::DialNumberResponse(message);
       } else {
         return new commands::DialNumberRequest(message);
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 1762018e98..6dbff0fcb8 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -2205,18 +2205,6 @@
         <description>ID of application that concerns this RPC.</description>
       </param>
     </function>
-    <function name="DialNumber" messagetype="request">
-      <description>Request from SDL to call a specific number.</description>
-      <param name="number" type="String" maxlength="40">
-        <description>Phone number is a string, which can be up to 40 chars.
-        All characters shall be stripped from string except digits 0-9 and * # , ; +
-        </description>
-      </param>
-      <param name="appID" type="Integer" mandatory="true">
-        <description>ID of application that concerns this RPC.</description>
-      </param>
-    </function>
-
     <function name="DialNumber" messagetype="response">
     </function>
     <!-- Policies -->