From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Thu, 2 Apr 2020 03:21:14 +0000 (+0900)
Subject: Merge branch 'tizen_5.5' into tizen
X-Git-Tag: submit/tizen/20200408.110745~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee9ef3f1886d404a1161134900fa6ecddbfb38b4;p=platform%2Fcore%2Fuifw%2Fmulti-assistant-service.git

Merge branch 'tizen_5.5' into tizen

Change-Id: I784fa584dddbcaf536edc9f9656a78f66cd99412
---

ee9ef3f1886d404a1161134900fa6ecddbfb38b4
diff --cc inc/multi_assistant_service_client.h
index ecfed68,be2e984..0c93cf6
--- a/inc/multi_assistant_service_client.h
+++ b/inc/multi_assistant_service_client.h
@@@ -57,10 -79,8 +79,12 @@@ int mas_client_set_preprocessing_allow_
  
  int mas_client_send_preprocessing_result(int pid, bool result);
  
 +int mas_client_set_wake_word_audio_require_flag(int pid, bool require);
 +
 +int mas_client_set_assistant_language(int pid, const char* language);
 +
+ int mas_client_send_voice_key_status_change(int pid, ma_voice_key_status_e status);
+ 
  int mas_ui_client_initialize(int pid);
  
  int mas_ui_client_deinitialize(int pid);
diff --cc inc/multi_assistant_service_plugin.h
index dc30af4,db1b6df..de04670
--- a/inc/multi_assistant_service_plugin.h
+++ b/inc/multi_assistant_service_plugin.h
@@@ -83,10 -83,10 +83,14 @@@ int multi_assistant_service_plugin_get_
  
  int multi_assistant_service_plugin_get_recording_audio_source_type(char **type);
  
 +int multi_assistant_service_plugin_set_wake_word_audio_require_flag(const char* appid, bool require);
 +
 +int multi_assistant_service_plugin_set_assistant_language(const char* appid, const char* language);
 +
+ int multi_assistant_service_plugin_set_voice_key_tap_duration(float duration);
+ 
+ int multi_assistant_service_plugin_unset_voice_key_tap_duration(void);
+ 
  int multi_assistant_service_plugin_set_callbacks(void);
  
  int multi_assistant_service_plugin_set_wakeup_event_callback(wakeup_service_wakeup_event_cb callback, void* user_data);