add CWakeupManager::set_assistant_enabled(string appid, bool enabled)

Change-Id: I73ba499a34e11bab278b192eb6f93bfa4aecb907

diff --git a/plugins/wakeup-manager/inc/wakeup_settings.h b/plugins/wakeup-manager/inc/wakeup_settings.h
index 95a49ad..4e55aa0 100644 (file)
--- a/plugins/wakeup-manager/inc/wakeup_settings.h
+++ b/plugins/wakeup-manager/inc/wakeup_settings.h
@@ -58,7 +58,7 @@ public:
        float get_wakeup_policy_delay();
        vector<string> get_wakeup_policy_priority();
        float get_streaming_duration_max();
-
+       void set_assistant_enabled(string appid, bool enabled);
 private:
        string mDefaultAssistantAppid{DEFAULT_ASSISTANT_APPID};
        bool mUiPanelEnabled{true};

diff --git a/plugins/wakeup-manager/src/wakeup_audio_manager.cpp b/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
index bdb7d6c..8a16fcd 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_audio_manager.cpp
@@ -318,7 +318,6 @@ int CAudioManager::initialize(void)
 int CAudioManager::deinitialize(void)
 {
        MWR_LOGD("[ENTER]");
-
        clear_speech_data();
 
 #ifdef TV_PRODUCT

diff --git a/plugins/wakeup-manager/src/wakeup_manager.cpp b/plugins/wakeup-manager/src/wakeup_manager.cpp
index be9d791..76950c8 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager.cpp
@@ -312,9 +312,8 @@ bool CWakeupManager::set_assistant_wakeup_engine(string appid, string engine)
 bool CWakeupManager::set_assistant_enabled(string appid, bool enabled)
 {
        MWR_LOGD("[ENTER]");
-
+       mWakeupSettings.set_assistant_enabled(appid, enabled);
        MWR_LOGD("[END]");
-
        return true;
 }
 

diff --git a/plugins/wakeup-manager/src/wakeup_settings.cpp b/plugins/wakeup-manager/src/wakeup_settings.cpp
index 4c63125..4ed21b3 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_settings.cpp
+++ b/plugins/wakeup-manager/src/wakeup_settings.cpp
@@ -135,5 +135,21 @@ float CWakeupSettings::get_streaming_duration_max()
        return mStreamingDurationMax;
 }
 
+void CWakeupSettings::set_assistant_enabled(string appid, bool enabled)
+{
+       int found = 0;
+       for(auto it = mEnabledAssistants.begin(); it != mEnabledAssistants.end(); it++) {
+               if(appid == *it) {
+                       if(false == enabled) {
+                               mEnabledAssistants.erase(it);
+                       }
+                       found = 1;
+                       break;
+               }
+       }
+       if((0 == found) && (true == enabled)) {
+               mEnabledAssistants.push_back(appid);
+       }
+}
 } // wakeup
 } // multiassistant