Enable virtual stream logic during dialing in TW2

Change-Id: I264be796a1100899a6239e0125965951ba5196e2

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 2122dbf8524b753b571fb26e5dddefcaaece85c9..da942c457ca18282ac66f39d7eb8d0c5a1f58603 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 21
+%define patchlevel 22
 %define ext_feature 0
 
 Name:           call-manager

diff --git a/service/src/callmgr-core.c b/service/src/callmgr-core.c
index 578e1dc4030eb3c761ddf4220f71bc1c186e87d1..ce688747016b3013ff195c81aa66e8ccb02c23d2 100644 (file)
--- a/service/src/callmgr-core.c
+++ b/service/src/callmgr-core.c
@@ -1171,22 +1171,24 @@ static void __callmgr_core_process_telephony_events(cm_telephony_event_type_e ev
                        err("_callmgr_audio_acquire_sound_stream_focus() failed");
                }
 
-#if 0
                /*
                 * In case of TM1 device, audio routing logic should be handled
                 * by multimedia framework not telephony to support local ringback tone play
                 * during call establishment. In this case, "START" signal will be invoked from multimedia.
                 * so, audio routing logic will be triggered not here.
                 */
-               _callmgr_audio_get_audio_route(core_data->audio_handle, &route);
-               if (route == CALLMGR_AUDIO_ROUTE_NONE_E) {
-                       _callmgr_audio_is_sound_device_available(core_data->audio_handle, CALLMGR_AUDIO_DEVICE_BT_E, &is_bt_connected);
-                       if (is_bt_connected)
-                               _callmgr_audio_set_audio_route(core_data->audio_handle, CALLMGR_AUDIO_ROUTE_BT_E);
-                       else
-                               __callmgr_core_set_default_audio_route(core_data);
+               if (!g_strcmp0(core_data->model_name, "TM1")) {
+                       dbg("Should not start virtual stream in here in TM1 device. START signal will be invoked");
+               } else {
+                       _callmgr_audio_get_audio_route(core_data->audio_handle, &route);
+                       if (route == CALLMGR_AUDIO_ROUTE_NONE_E) {
+                               _callmgr_audio_is_sound_device_available(core_data->audio_handle, CALLMGR_AUDIO_DEVICE_BT_E, &is_bt_connected);
+                               if (is_bt_connected)
+                                       _callmgr_audio_set_audio_route(core_data->audio_handle, CALLMGR_AUDIO_ROUTE_BT_E);
+                               else
+                                       __callmgr_core_set_default_audio_route(core_data);
+                       }
                }
-#endif
 
                if (core_data->call_status != CALL_MANAGER_CALL_STATUS_OFFHOOK_E) {
                        __callmgr_core_set_call_status(core_data, CALL_MANAGER_CALL_STATUS_OFFHOOK_E, cm_call_type, NULL);