Prevent duplicated requests from canceling active streaming session

Change-Id: Ie0444f1b7bfa86bec4a415bc393e29ccee5839d0

diff --git a/plugins/wakeup-manager/src/wakeup_manager.cpp b/plugins/wakeup-manager/src/wakeup_manager.cpp
index 5b6271e..516669f 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager.cpp
@@ -828,11 +828,9 @@ bool CWakeupManager::start_streaming_utterance_data()
 {
        MWR_LOGI("[ENTER]");
 
-       if (mStreamingMode == STREAMING_MODE::UTTERANCE) {
-               if (mCurrentStreamingSessionID == mLastWakeupEventID) {
-                       MWR_LOGW("Streaming already started for this session");
-                       return false;
-               }
+       if (mCurrentStreamingSessionID == mLastWakeupEventID) {
+               MWR_LOGW("Streaming already started for this session");
+               return false;
        }
 
        mCurrentStreamingSessionID = mLastWakeupEventID;

diff --git a/src/service_ipc_dbus.cpp b/src/service_ipc_dbus.cpp
index 3114dc5..365c3b8 100644 (file)
--- a/src/service_ipc_dbus.cpp
+++ b/src/service_ipc_dbus.cpp
@@ -60,12 +60,12 @@ static void message_port_cb(int local_port_id,
                return;
        }
 
-       char *request = nullptr;
-       bundle_get_str(message, "request", &request);
-       if (request) {
-               const char *szStartStreamingRequest = "start_streaming_current_utterance";
-               if (strncmp(request, szStartStreamingRequest, strlen(szStartStreamingRequest)) == 0) {
-                       MAS_LOGE("start_streaming request");
+       char *command = nullptr;
+       bundle_get_str(message, "command", &command);
+       if (command) {
+               const char *szStartStreamingCommand = "start_streaming_current_utterance";
+               if (strncmp(command, szStartStreamingCommand, strlen(szStartStreamingCommand)) == 0) {
+                       MAS_LOGE("AP sent start streaming request");
                        observer->on_ap_start_streaming_audio_data(std::string{remote_app_id},
                                MA_AUDIO_STREAMING_DATA_TYPE_CURRENT_UTTERANCE);
                }