diff options
| -rw-r--r-- | flags/a2dp.aconfig | 10 | ||||
| -rw-r--r-- | system/btif/src/btif_a2dp.cc | 9 |
2 files changed, 1 insertions, 18 deletions
diff --git a/flags/a2dp.aconfig b/flags/a2dp.aconfig index 0cf6dc8ef0..3b47657936 100644 --- a/flags/a2dp.aconfig +++ b/flags/a2dp.aconfig @@ -49,16 +49,6 @@ flag { } flag { - name: "stop_on_offload_fail" - namespace: "bluetooth" - description: "Stop instead of disconnecting AVDT when offload fails" - bug: "345709100" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "av_stream_reconfigure_fix" namespace: "bluetooth" description: "Handle AVDT stream reconfiguration in an event" diff --git a/system/btif/src/btif_a2dp.cc b/system/btif/src/btif_a2dp.cc index c572a34e2b..d643d199a2 100644 --- a/system/btif/src/btif_a2dp.cc +++ b/system/btif/src/btif_a2dp.cc @@ -148,14 +148,7 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, tBTA_AV_STATUS st if (btif_av_is_a2dp_offload_running()) { if (ack != Status::SUCCESS && btif_av_stream_started_ready(A2dpType::kSource)) { log::error("peer {} offload start failed", peer_addr); - if (com::android::bluetooth::flags::stop_on_offload_fail()) { - btif_av_stream_stop(peer_addr); - } else { - // Offload request will return with failure from btif_av sm if - // suspend is triggered for remote start. Disconnect only if SoC - // returned failure for offload VSC - btif_av_source_disconnect(peer_addr); - } + btif_av_stream_stop(peer_addr); } } |