diff options
Diffstat (limited to 'btif/src/btif_a2dp.cc')
| -rw-r--r-- | btif/src/btif_a2dp.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/btif/src/btif_a2dp.cc b/btif/src/btif_a2dp.cc index e2d613274..c9f45928f 100644 --- a/btif/src/btif_a2dp.cc +++ b/btif/src/btif_a2dp.cc @@ -60,6 +60,7 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, tBTA_AV_START* p_av_start if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) { bluetooth::audio::a2dp::ack_stream_started(status); } else if (btif_av_is_a2dp_offload_enabled()) { + // TODO: BluetoothA2dp@1.0 is deprecated btif_a2dp_audio_on_started(status); } else { btif_a2dp_command_ack(status); @@ -75,7 +76,7 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, tBTA_AV_START* p_av_start LOG(WARNING) << __func__ << ": peer " << peer_addr << " A2DP is suspending and ignores the started event"; return false; } - if (btif_av_is_a2dp_offload_enabled()) { + if (btif_av_is_a2dp_offload_running()) { btif_av_stream_start_offload(); } else if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) { if (btif_av_get_peer_sep() == AVDT_TSEP_SNK) { @@ -98,6 +99,7 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, tBTA_AV_START* p_av_start if (bluetooth::audio::a2dp::is_hal_2_0_enabled()) { bluetooth::audio::a2dp::ack_stream_started(A2DP_CTRL_ACK_FAILURE); } else if (btif_av_is_a2dp_offload_enabled()) { + // TODO: BluetoothA2dp@1.0 is deprecated btif_a2dp_audio_on_started(p_av_start->status); } else { btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE); @@ -116,9 +118,10 @@ void btif_a2dp_on_stopped(tBTA_AV_SUSPEND* p_av_suspend) { return; } if (bluetooth::audio::a2dp::is_hal_2_0_enabled() || - !btif_av_is_a2dp_offload_enabled()) { + !btif_av_is_a2dp_offload_running()) { btif_a2dp_source_on_stopped(p_av_suspend); } else if (p_av_suspend != NULL) { + // TODO: BluetoothA2dp@1.0 is deprecated btif_a2dp_audio_on_stopped(p_av_suspend->status); } } @@ -131,9 +134,10 @@ void btif_a2dp_on_suspended(tBTA_AV_SUSPEND* p_av_suspend) { return; } if (bluetooth::audio::a2dp::is_hal_2_0_enabled() || - !btif_av_is_a2dp_offload_enabled()) { + !btif_av_is_a2dp_offload_running()) { btif_a2dp_source_on_suspended(p_av_suspend); } else if (p_av_suspend != NULL) { + // TODO: BluetoothA2dp@1.0 is deprecated btif_a2dp_audio_on_suspended(p_av_suspend->status); } } @@ -159,7 +163,7 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, ack = A2DP_CTRL_ACK_FAILURE; break; } - if (btif_av_is_a2dp_offload_enabled()) { + if (btif_av_is_a2dp_offload_running()) { if (ack != BTA_AV_SUCCESS && btif_av_stream_started_ready()) { // Offload request will return with failure from btif_av sm if // suspend is triggered for remote start. Disconnect only if SoC @@ -173,6 +177,7 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, bluetooth::audio::a2dp::ack_stream_started(ack); } else { btif_a2dp_command_ack(ack); + // TODO: BluetoothA2dp@1.0 is deprecated btif_a2dp_audio_on_started(status); } } |