diff options
| author | 2025-03-20 02:33:27 -0700 | |
|---|---|---|
| committer | 2025-03-20 02:33:27 -0700 | |
| commit | d41059588a81284587453a5a5abf194979ccab58 (patch) | |
| tree | 380568161d5645c934560ee0451efeef8a0ba5e3 | |
| parent | 1efe227eb1baef6b02a83a83164e3833b98e5bb4 (diff) | |
| parent | 4a412913201d50b27658c0db65b00a13ccf3ef74 (diff) | |
Merge "flag: Remove gatt_disconnect_fix flag" into main
| -rw-r--r-- | flags/gap.aconfig | 10 | ||||
| -rw-r--r-- | system/stack/eatt/eatt_impl.h | 6 | ||||
| -rw-r--r-- | system/stack/gatt/gatt_main.cc | 2 | ||||
| -rw-r--r-- | system/stack/test/eatt/eatt_test.cc | 1 |
4 files changed, 2 insertions, 17 deletions
diff --git a/flags/gap.aconfig b/flags/gap.aconfig index 8e7d9c99ac..6748387139 100644 --- a/flags/gap.aconfig +++ b/flags/gap.aconfig @@ -70,16 +70,6 @@ flag { } flag { - name: "gatt_disconnect_fix" - namespace: "bluetooth" - description: "Fix GATT disconnect handling" - bug: "361538527" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "gatt_server_requests_fix" namespace: "bluetooth" description: "Fix GATT server handling" diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h index 0d27726af4..b602636f0d 100644 --- a/system/stack/eatt/eatt_impl.h +++ b/system/stack/eatt/eatt_impl.h @@ -723,11 +723,7 @@ struct eatt_impl { tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(channel->bda_, BT_TRANSPORT_LE); log::warn("disconnecting channel {:#x} for {}", channel->cid_, channel->bda_); - if (com::android::bluetooth::flags::gatt_disconnect_fix()) { - EattExtension::GetInstance()->Disconnect(channel->bda_, channel->cid_); - } else { - gatt_disconnect(p_tcb); - } + EattExtension::GetInstance()->Disconnect(channel->bda_, channel->cid_); } void start_indication_confirm_timer(const RawAddress& bd_addr, uint16_t cid) { diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc index 19fd83990a..5228369a26 100644 --- a/system/stack/gatt/gatt_main.cc +++ b/system/stack/gatt/gatt_main.cc @@ -282,7 +282,7 @@ bool gatt_disconnect(tGATT_TCB* p_tcb) { return true; } - if (com::android::bluetooth::flags::gatt_disconnect_fix() && p_tcb->eatt) { + if (p_tcb->eatt) { /* ATT is fixed channel and it is expected to drop ACL. * Make sure all EATT channels are disconnected before doing that. */ diff --git a/system/stack/test/eatt/eatt_test.cc b/system/stack/test/eatt/eatt_test.cc index 5d7a2eeea8..17f4908b3e 100644 --- a/system/stack/test/eatt/eatt_test.cc +++ b/system/stack/test/eatt/eatt_test.cc @@ -660,7 +660,6 @@ TEST_F(EattTest, ChannelUnavailableWhileReconfiguring) { } TEST_F(EattTest, DisconnectChannelOnIndicationConfirmationTimeout) { - com::android::bluetooth::flags::provider_->gatt_disconnect_fix(true); ConnectDeviceEattSupported(1); eatt_instance_->StartIndicationConfirmationTimer(test_address, test_local_cids[0]); |