Merge commit 'f22be37' into tizen

Change-Id: I0d18dea32fd921a057f45d029cff60cfa76ce220

diff --cc inc/service_common.h
index 747b57a,27250ef..3da1e46
--- 1/inc/service_common.h
--- 2/inc/multi_assistant_main.h
+++ b/inc/service_common.h
@@@ -74,9 -66,7 +74,9 @@@
  #define MA_METHOD_SET_PREPROCESSING_ALLOW_MODE                "ma_method_set_preprocessing_allow_mode"
  #define MA_METHOD_SEND_PREPROCESSING_RESULT                   "ma_method_send_preprocessing_result"
  #define MA_METHOD_SET_WAKE_WORD_AUDIO_REQUIRE_FLAG    "ma_method_set_wake_word_audio_require_flag"
- #define MA_METHOD_SET_ASSISTANT_LANGUAGE                      "ma_method_set_assistant_language"
 -#define MA_METHOD_SET_ASSISTANT_WAKEUP_LANGUAGE                       "ma_method_set_assistant_wakeup_language"
++#define MA_METHOD_SET_ASSISTANT_WAKEUP_LANGUAGE               "ma_method_set_assistant_wakeup_language"
 +#define MA_METHOD_ADD_WAKE_WORD                                               "ma_method_add_wake_word"
 +#define MA_METHOD_REMOVE_WAKE_WORD                                    "ma_method_remove_wake_word"
  #define MA_METHOD_ERROR                                                               "ma_method_error"
  
  #define MA_UI_METHOD_INITIALIZE                                               "ma_ui_method_initialize"

diff --cc src/service_ipc_dbus.cpp
index 72c18b4,a3f2777..f6fba74
--- 1/src/service_ipc_dbus.cpp
--- 2/src/multi_assistant_dbus.c
+++ b/src/service_ipc_dbus.cpp
@@@ -1044,70 -1032,64 +1044,70 @@@ static Eina_Bool listener_event_callbac
  
                /* client event */
                if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_HELLO)) {
 -                      ma_service_dbus_hello(g_conn_listener, msg);
 +                      dispatcher->on_hello(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_INITIALIZE)) {
 -                      ma_service_dbus_initialize(g_conn_listener, msg);
 +                      dispatcher->on_initialize(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_DEINITIALIZE)) {
 -                      ma_service_dbus_deinitialize(g_conn_listener, msg);
 +                      dispatcher->on_deinitialize(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_GET_RECORDING_AUDIO_FORMAT)) {
 -                      ma_service_dbus_get_audio_format(g_conn_listener, msg);
 +                      dispatcher->on_get_audio_format(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_GET_RECORDING_AUDIO_SOURCE_TYPE)) {
 -                      ma_service_dbus_get_audio_source_type(g_conn_listener, msg);
 +                      dispatcher->on_get_audio_source_type(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SEND_ASR_RESULT)) {
 -                      ma_service_dbus_send_asr_result(g_conn_listener, msg);
 +                      dispatcher->on_send_asr_result(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SEND_RESULT)) {
 -                      ma_service_dbus_send_result(g_conn_listener, msg);
 +                      dispatcher->on_send_result(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SEND_RECOGNITION_RESULT)) {
 -                      ma_service_dbus_send_recognition_result(g_conn_listener, msg);
 +                      dispatcher->on_send_recognition_result(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_START_STREAMING_AUDIO_DATA)) {
 -                      ma_service_dbus_start_streaming_audio_data(g_conn_listener, msg);
 +                      dispatcher->on_start_streaming_audio_data(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_STOP_STREAMING_AUDIO_DATA)) {
 -                      ma_service_dbus_stop_streaming_audio_data(g_conn_listener, msg);
 +                      dispatcher->on_stop_streaming_audio_data(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_UPDATE_VOICE_FEEDBACK_STATE)) {
 -                      ma_service_dbus_update_voice_feedback_state(g_conn_listener, msg);
 +                      dispatcher->on_update_voice_feedback_state(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SEND_ASSISTANT_SPECIFIC_COMMAND)) {
 -                      ma_service_dbus_send_assistant_specific_command(g_conn_listener, msg);
 +                      dispatcher->on_send_assistant_specific_command(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SET_BACKGROUND_VOLUME)) {
 -                      ma_service_dbus_set_background_volume(g_conn_listener, msg);
 +                      dispatcher->on_set_background_volume(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SET_PREPROCESSING_ALLOW_MODE)) {
 -                      ma_service_dbus_set_preprocessing_allow_mode(g_conn_listener, msg);
 +                      dispatcher->on_set_preprocessing_allow_mode(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SEND_PREPROCESSING_RESULT)) {
 -                      ma_service_dbus_send_preprocessing_result(g_conn_listener, msg);
 +                      dispatcher->on_send_preprocessing_result(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SET_WAKE_WORD_AUDIO_REQUIRE_FLAG)) {
 -                      ma_service_dbus_set_wake_word_audio_require_flag(g_conn_listener, msg);
 +                      dispatcher->on_set_wake_word_audio_require_flag(mConnectionListener, msg);
  
-               } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SET_ASSISTANT_LANGUAGE)) {
+               } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_SET_ASSISTANT_WAKEUP_LANGUAGE)) {
 -                      ma_service_dbus_set_assistant_language(g_conn_listener, msg);
 +                      dispatcher->on_set_assistant_language(mConnectionListener, msg);
 +
 +              } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_ADD_WAKE_WORD)) {
 +                      dispatcher->on_add_wake_word(mConnectionListener, msg);
 +
 +              } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_METHOD_REMOVE_WAKE_WORD)) {
 +                      dispatcher->on_remove_wake_word(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_UI_METHOD_INITIALIZE)) {
 -                      ma_service_ui_dbus_initialize(g_conn_listener, msg);
 +                      dispatcher->on_ui_initialize(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_UI_METHOD_DEINITIALIZE)) {
 -                      ma_service_ui_dbus_deinitialize(g_conn_listener, msg);
 +                      dispatcher->on_ui_deinitialize(mConnectionListener, msg);
  
                } else if (dbus_message_is_method_call(msg, MA_SERVER_SERVICE_INTERFACE, MA_UI_METHOD_CHANGE_ASSISTANT)) {
 -                      ma_service_ui_dbus_change_assistant(g_conn_listener, msg);
 +                      dispatcher->on_ui_change_assistant(mConnectionListener, msg);
  
                } else {
                        MAS_LOGD("Message is NOT valid");