From 7221b868f05816b602529d053b145e84a025db44 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Wed, 26 Aug 2020 11:27:14 +0900 Subject: [PATCH] Update selected wakeup info based on wakeup engine name Change-Id: Ib9098fd831797fbd1e6c0509438e090f5593a47f --- plugins/wakeup-manager/src/wakeup_engine_manager.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/wakeup-manager/src/wakeup_engine_manager.cpp b/plugins/wakeup-manager/src/wakeup_engine_manager.cpp index 2765498..09803a8 100644 --- a/plugins/wakeup-manager/src/wakeup_engine_manager.cpp +++ b/plugins/wakeup-manager/src/wakeup_engine_manager.cpp @@ -160,14 +160,18 @@ bool CWakeupEngineManager::get_audio_data_required() void CWakeupEngineManager::set_selected_wakeup_info(mas_wakeup_event_info wakeup_info) { mSelectedEngine = nullptr; - for (const auto& info : mEngineInfo) { - string appid = string{wakeup_info.wakeup_appid}; - bool found = contains(info.assistant_list, appid); - if (found) { - mSelectedEngine = &info; - MWR_LOGD("Selected : %s", info.engine_name.c_str()); - } + const auto& iter = find_if(mEngineInfo.begin(), mEngineInfo.end(), + [wakeup_info](const EngineInfo& info) { + if (nullptr == wakeup_info.wakeup_engine) + return false; + + return (0 == info.engine_name.compare(wakeup_info.wakeup_engine)); + }); + + if (iter != mEngineInfo.end()) { + mSelectedEngine = &(*iter); + MWR_LOGD("Selected : %s", iter->engine_name.c_str()); } } -- 2.7.4