From 8fa80c8b9528f8cf802e30ef63e763b33fc8c315 Mon Sep 17 00:00:00 2001 From: Henri Chataing Date: Thu, 6 Mar 2025 23:02:54 +0000 Subject: 25Q1: Remove a2dp_clear_pending_start_on_session_restart Bug: 378524655 Test: m com.google.android.bt Flag: com::android::bluetooth::flags::a2dp_clear_pending_start_on_session_restart Change-Id: I6a93cba622d2b9aa4ddf92bf4e936b237a9cc57a --- flags/a2dp.aconfig | 10 ---------- system/btif/src/btif_av.cc | 10 ++++------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/flags/a2dp.aconfig b/flags/a2dp.aconfig index 53c056ab86..e7b9aa21b0 100644 --- a/flags/a2dp.aconfig +++ b/flags/a2dp.aconfig @@ -48,16 +48,6 @@ flag { } } -flag { - name: "a2dp_clear_pending_start_on_session_restart" - namespace: "bluetooth" - description: "Clear the kPendingStart flag when the audio session is restarted for codec reconfiguration" - bug: "378524655" - metadata { - purpose: PURPOSE_BUGFIX - } -} - flag { name: "avdt_handle_suspend_cfm_bad_state" namespace: "bluetooth" diff --git a/system/btif/src/btif_av.cc b/system/btif/src/btif_av.cc index e4f784a39c..101ebcc4a0 100644 --- a/system/btif/src/btif_av.cc +++ b/system/btif/src/btif_av.cc @@ -2400,12 +2400,10 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, void* p_data) std::promise peer_ready_promise; std::future peer_ready_future = peer_ready_promise.get_future(); - if (com::android::bluetooth::flags::a2dp_clear_pending_start_on_session_restart()) { - // The stream may not be restarted without an explicit request from the - // Bluetooth Audio HAL. Any start request that was pending before the - // reconfiguration is invalidated when the session is ended. - peer_.ClearFlags(BtifAvPeer::kFlagPendingStart); - } + // The stream may not be restarted without an explicit request from the + // Bluetooth Audio HAL. Any start request that was pending before the + // reconfiguration is invalidated when the session is ended. + peer_.ClearFlags(BtifAvPeer::kFlagPendingStart); btif_a2dp_source_start_session(peer_.PeerAddress(), std::move(peer_ready_promise)); } -- cgit v1.2.3-59-g8ed1b