Change the audio session release sqeuence

 -  should execute to focus-release after calling to stop-vstream

Change-Id: If1f419e39ea7ab46a205198d671836971e4fcbec

diff --git a/module/src/callmgr-audio.c b/module/src/callmgr-audio.c
index 0036c1f8a215fe1492b38efbc41851ca4677580c..8a7e1d72a6cb5448e72a575ab869e0eca7c93760 100644 (file)
--- a/module/src/callmgr-audio.c
+++ b/module/src/callmgr-audio.c
@@ -328,18 +328,6 @@ int _callmgr_audio_destroy_call_sound_session(callmgr_audio_handle_h audio_handl
                return -1;
        }
 
-       dbg("Sound stream focus state: [%s]",
-               focus_state == SOUND_STREAM_FOCUS_STATE_ACQUIRED ? "FOCUS_ACQUIRED" : "FOCUS_RELEASED");
-       if (focus_state == SOUND_STREAM_FOCUS_STATE_ACQUIRED) {
-               /* Release sound stream focus */
-               ret = sound_manager_release_focus(audio_handle->sound_stream_handle,
-                       SOUND_STREAM_FOCUS_FOR_PLAYBACK|SOUND_STREAM_FOCUS_FOR_RECORDING, SOUND_BEHAVIOR_NONE, NULL);
-               if (ret != SOUND_MANAGER_ERROR_NONE) {
-                       err("sound_manager_release_focus() get failed with err[%d]", ret);
-                       return -1;
-               }
-       }
-
        if (audio_handle->vstream) {
                if (audio_handle->vstream_status) {
                        /* Stop virtual stream */
@@ -360,6 +348,18 @@ int _callmgr_audio_destroy_call_sound_session(callmgr_audio_handle_h audio_handl
                warn("No vstream handle");
        }
 
+       dbg("Sound stream focus state: [%s]",
+               focus_state == SOUND_STREAM_FOCUS_STATE_ACQUIRED ? "FOCUS_ACQUIRED" : "FOCUS_RELEASED");
+       if (focus_state == SOUND_STREAM_FOCUS_STATE_ACQUIRED) {
+               /* Release sound stream focus */
+               ret = sound_manager_release_focus(audio_handle->sound_stream_handle,
+                       SOUND_STREAM_FOCUS_FOR_PLAYBACK|SOUND_STREAM_FOCUS_FOR_RECORDING, SOUND_BEHAVIOR_NONE, NULL);
+               if (ret != SOUND_MANAGER_ERROR_NONE) {
+                       err("sound_manager_release_focus() get failed with err[%d]", ret);
+                       return -1;
+               }
+       }
+
        /* Destroy sound stream */
        ret = sound_manager_destroy_stream_information(audio_handle->sound_stream_handle);
        if (ret != SOUND_MANAGER_ERROR_NONE) {

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index bb0cb63ca181ab53481a582a45872142019cc6ed..9835e59212729ac5fa640538c48673f5e20ae4f5 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 37
+%define patchlevel 38
 %define ext_feature 0
 
 Name:           call-manager