3 files changed, 3 insertions, 20 deletions
diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index d12e294ec7..eee252a7af 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -206,16 +206,6 @@ flag {
 }
 
 flag {
-    name: "drop_acl_fragment_on_disconnect"
-    namespace: "bluetooth"
-    description: "Drop pending ACL packet fragments for disconnected connection"
-    bug: "376379859"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "configure_scan_on_resume"
     namespace: "bluetooth"
     description: "Configure scan paramters when start scanning from onResume"
diff --git a/system/gd/hci/acl_manager/round_robin_scheduler.cc b/system/gd/hci/acl_manager/round_robin_scheduler.cc
index 6abf838728..3d0ff461ae 100644
--- a/system/gd/hci/acl_manager/round_robin_scheduler.cc
+++ b/system/gd/hci/acl_manager/round_robin_scheduler.cc
@@ -17,7 +17,6 @@
 #include "hci/acl_manager/round_robin_scheduler.h"
 
 #include <bluetooth/log.h>
-#include <com_android_bluetooth_flags.h>
 
 #include <memory>
 #include <utility>
@@ -65,10 +64,8 @@ void RoundRobinScheduler::Unregister(uint16_t handle) {
   log::assert_that(acl_queue_handlers_.count(handle) == 1,
                    "assert failed: acl_queue_handlers_.count(handle) == 1");
 
-  if (com::android::bluetooth::flags::drop_acl_fragment_on_disconnect()) {
-    // Drop the pending fragments and recalculate number_of_sent_packets_
-    drop_packet_fragments(handle);
-  }
+  // Drop the pending fragments and recalculate number_of_sent_packets_
+  drop_packet_fragments(handle);
 
   auto& acl_queue_handler = acl_queue_handlers_.find(handle)->second;
   log::info("unregistering acl_queue handle={}, sent_packets={}", handle,
@@ -94,8 +91,7 @@ void RoundRobinScheduler::Unregister(uint16_t handle) {
   starting_point_ = acl_queue_handlers_.begin();
 
   // Restart sending packets if we got acl credits
-  if (com::android::bluetooth::flags::drop_acl_fragment_on_disconnect() &&
-      credits_reclaimed_from_zero) {
+  if (credits_reclaimed_from_zero) {
     start_round_robin();
   }
 }
diff --git a/system/gd/hci/acl_manager/round_robin_scheduler_test.cc b/system/gd/hci/acl_manager/round_robin_scheduler_test.cc
index f2c9b5528b..da34f85605 100644
--- a/system/gd/hci/acl_manager/round_robin_scheduler_test.cc
+++ b/system/gd/hci/acl_manager/round_robin_scheduler_test.cc
@@ -16,7 +16,6 @@
 
 #include "hci/acl_manager/round_robin_scheduler.h"
 
-#include <com_android_bluetooth_flags.h>
 #include <gtest/gtest.h>
 
 #include "common/bidi_queue.h"
@@ -422,8 +421,6 @@ TEST_F(RoundRobinSchedulerTest, receive_le_credit_when_next_fragment_is_classic)
 }
 
 TEST_F(RoundRobinSchedulerTest, unregister_reclaim_credits) {
-  com::android::bluetooth::flags::provider_->drop_acl_fragment_on_disconnect(true);
-
   uint16_t handle = 0x01;
   auto connection_queue = std::make_shared<AclConnection::Queue>(20);
   auto new_connection_queue = std::make_shared<AclConnection::Queue>(20);