From: Wootak Jung Date: Wed, 1 Nov 2023 23:15:58 +0000 (+0900) Subject: Change the HFP supported device to DA from FHUB X-Git-Tag: accepted/tizen/unified/20231106.171624^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F300747%2F1;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-agent.git Change the HFP supported device to DA from FHUB Change-Id: Ia5d4e1c4822da54a7e2115d2f5d82de588eaaa9e Signed-off-by: Wootak Jung --- diff --git a/hf-agent/bluetooth-hf-agent.c b/hf-agent/bluetooth-hf-agent.c index 2399c51..a4191b5 100644 --- a/hf-agent/bluetooth-hf-agent.c +++ b/hf-agent/bluetooth-hf-agent.c @@ -1212,7 +1212,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, "CallStarted", NULL); bt_hf_info->is_dialing = FALSE; bt_hf_info->call_active = TRUE; - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_STARTED; } else if (bt_hf_info->call_active) { __bt_hf_agent_emit_signal(conn, @@ -1220,7 +1220,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_SERVICE_INTERFACE, "CallEnded", NULL); bt_hf_info->call_active = FALSE; - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_ENDED; if (bt_hf_info->ciev_call_setup_status == 0) { @@ -1228,7 +1228,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_AGENT_OBJECT_PATH, BT_HF_SERVICE_INTERFACE, "CallIdle", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_IDLE; } } @@ -1242,7 +1242,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_SERVICE_INTERFACE, "CallTerminated", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_TERMINATED; } else if (!bt_hf_info->is_dialing && value > 0) { bt_hf_info->is_dialing = TRUE; @@ -1253,7 +1253,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_AGENT_OBJECT_PATH, BT_HF_SERVICE_INTERFACE, "CallSetupIncoming", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_SETUP_INCOMING; if (__bt_hf_agent_launch_call_app() == FALSE) DBG("call app launching failed"); @@ -1262,14 +1262,14 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_AGENT_OBJECT_PATH, BT_HF_SERVICE_INTERFACE, "CallSetupDialing", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_SETUP_DIALING; } else if (bt_hf_info->ciev_call_setup_status == 3) { __bt_hf_agent_emit_signal(gdbus_conn, BT_HF_AGENT_OBJECT_PATH, BT_HF_SERVICE_INTERFACE, "CallSetupAlerting", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_SETUP_ALERTING; } else if (bt_hf_info->ciev_call_status == 0 && bt_hf_info->ciev_call_setup_status == 0) { @@ -1277,7 +1277,7 @@ static void __bt_hf_agent_handle_ind_change(bt_hf_agent_info_t *bt_hf_info, BT_HF_AGENT_OBJECT_PATH, BT_HF_SERVICE_INTERFACE, "CallIdle", NULL); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_IDLE; } } else if (!strcmp(name, "\"callheld\"")) { @@ -2805,7 +2805,7 @@ static gboolean __bt_hf_agent_sco_accept_cb(GIOChannel *chan, GIOCondition cond, g_io_channel_set_flags(sco_io, G_IO_FLAG_NONBLOCK, NULL); g_io_channel_set_buffered(sco_io, FALSE); - if (TIZEN_MODEL_NAME_FHUB) { + if (TIZEN_MODEL_NAME_DA) { bt_hf_info->call_state = BT_HF_DA_CALL_STAT_CALL_IDLE; bt_hf_info->is_first_audio_out = TRUE; bt_hf_info->is_first_audio_in = TRUE; @@ -3024,7 +3024,7 @@ static gboolean __bt_establish_service_level_conn(bt_hf_agent_info_t *bt_hf_info char *buf_ptr; guint feature; - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) feature = BT_HF_FEATURE_CLI_PRESENTATION | BT_HF_FEATURE_REMOTE_VOLUME_CONTROL | BT_HF_FEATURE_ENHANCED_CALL_STATUS; @@ -3446,7 +3446,7 @@ static int __bt_hf_register_profile(const char *uuid, uint16_t version, g_variant_builder_add(builder, "{sv}", "features", g_variant_new("q", features)); - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) ret = g_dbus_proxy_call_sync(proxy, "RegisterProfile", g_variant_new("(osa{sv})", object, uuid, builder), @@ -3496,7 +3496,7 @@ static void __bt_hf_agent_register(void) if (ret) ERR("Error in hf register"); - if (TIZEN_MODEL_NAME_FHUB) { + if (TIZEN_MODEL_NAME_DA) { ret = __bt_hf_register_profile(PBAP_PCE_UUID, 0x0101, "Phone Book Access Client", BT_PBAP_CLIENT_OBJECT_PATH, 0); @@ -4035,7 +4035,7 @@ static uint32_t __bt_hf_agent_get_hf_features(void) { uint32_t hf_features; - if (TIZEN_MODEL_NAME_FHUB) + if (TIZEN_MODEL_NAME_DA) hf_features = BT_HF_FEATURE_CLI_PRESENTATION | BT_HF_FEATURE_REMOTE_VOLUME_CONTROL; else {