From 2597076d0537103c504ee0abaf2037363098c7a0 Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Mon, 24 Oct 2016 19:17:16 +0900 Subject: [PATCH] Fix BT routing issue when BT device is disconnected BT device should be removed after BT disconnected Change-Id: Ia9473de0e36727287fd256a6cb4d3e799edfabff --- packaging/call-manager.spec | 2 +- service/src/callmgr-core.c | 11 ++++++++--- service/src/callmgr-dbus.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec index 85c8cca..cb6cc2c 100755 --- a/packaging/call-manager.spec +++ b/packaging/call-manager.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 77 +%define patchlevel 78 %define ext_feature 0 Name: call-manager diff --git a/service/src/callmgr-core.c b/service/src/callmgr-core.c index bd9d0dd..9027f33 100644 --- a/service/src/callmgr-core.c +++ b/service/src/callmgr-core.c @@ -1670,10 +1670,15 @@ static void __callmgr_core_process_audio_events(cm_audio_event_type_e event_type break; case CM_AUDIO_EVENT_BT_CHANGED_E: { - if (core_data->active_dial || core_data->held) - _callmgr_audio_set_audio_route(core_data->audio_handle, CALLMGR_AUDIO_ROUTE_BT_E); - else + int is_connected = GPOINTER_TO_INT(event_data); + if (core_data->active_dial || core_data->held) { + if (is_connected) + _callmgr_audio_set_audio_route(core_data->audio_handle, CALLMGR_AUDIO_ROUTE_BT_E); + else + __callmgr_core_set_default_audio_route(core_data); + } else { info("No active call. Ignore"); + } } break; default: diff --git a/service/src/callmgr-dbus.c b/service/src/callmgr-dbus.c index fd05091..7651216 100644 --- a/service/src/callmgr-dbus.c +++ b/service/src/callmgr-dbus.c @@ -286,7 +286,7 @@ static gboolean __bluetooth_off_handler (GDBusInterfaceSkeleton *di, GDBusMethodInvocation *invoc, gpointer user_data) { int err = -1; - dbg("_set_extra_vol_handler() is called"); + dbg("__bluetooth_off_handler() is called"); callmgr_core_data_t *core_data = (callmgr_core_data_t *)user_data; CM_RETURN_VAL_IF_FAIL(core_data, FALSE); -- 2.7.4