summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi-hoon Lee <dalton.lee@samsung.com>2021-12-10 15:49:57 +0900
committerJi-hoon Lee <dalton.lee@samsung.com>2021-12-10 15:49:59 +0900
commited03355afa30399bc57655965401ee868325d415 (patch)
treea1951e4cff778e9a902515d3915db50d1e4242b8
parentd15c470485ca39d5178b3dc2f8fca53f5f2dca77 (diff)
downloadmulti-assistant-service-ed03355afa30399bc57655965401ee868325d415.tar.gz
multi-assistant-service-ed03355afa30399bc57655965401ee868325d415.tar.bz2
multi-assistant-service-ed03355afa30399bc57655965401ee868325d415.zip
Handle default assistant change event in UTTERANCE state
Previously, if default assistant gets changed in UTTERANCE state, the state doesn't get reset. Modified to generate recognition result ERROR event in this case. Change-Id: Ie9a58cdf8220d5f4d92ac19e79394b7e5145470c
-rw-r--r--plugins/wakeup-manager/src/wakeup_manager.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/wakeup-manager/src/wakeup_manager.cpp b/plugins/wakeup-manager/src/wakeup_manager.cpp
index 31eb2b9..00035cd 100644
--- a/plugins/wakeup-manager/src/wakeup_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager.cpp
@@ -312,6 +312,13 @@ bool CWakeupManager::set_default_assistant(string appid)
{
MWR_LOGE("[ENTER] %s", appid.c_str());
+ if (mWakeupManagerState == WAKEUP_MANAGER_STATE_UTTERANCE ||
+ mWakeupManagerState == WAKEUP_MANAGER_STATE_PROCESSING) {
+ if (mCurrentDefaultAssistant.compare(appid) != 0) {
+ update_recognition_result(mCurrentDefaultAssistant, MA_RECOGNITION_RESULT_EVENT_ERROR);
+ }
+ }
+
/* Check if previous default assistant has to be deactivated */
bool activated = true;
if (false == mAssistantSupportsCurrentLanguage[mCurrentDefaultAssistant]) {