Merge "flag: Remove gatt_server_requests_fix flag" into main

2 files changed, 6 insertions, 23 deletions

diff --git a/android/app/src/com/android/bluetooth/gatt/GattService.java b/android/app/src/com/android/bluetooth/gatt/GattService.java
index bc5aeb3367..10190b09ef 100644
--- a/android/app/src/com/android/bluetooth/gatt/GattService.java
+++ b/android/app/src/com/android/bluetooth/gatt/GattService.java
@@ -2319,21 +2319,14 @@ public class GattService extends ProfileService {
         int handle = 0;
         Integer connId = 0;
 
-        if (!Flags.gattServerRequestsFix()) {
-            HandleMap.Entry entry = mHandleMap.getByRequestId(requestId);
-            if (entry != null) {
-                handle = entry.mHandle;
-            }
-            connId = mServerMap.connIdByAddress(serverIf, address);
+        HandleMap.RequestData requestData = mHandleMap.getRequestDataByRequestId(requestId);
+        if (requestData != null) {
+            handle = requestData.handle();
+            connId = requestData.connId();
         } else {
-            HandleMap.RequestData requestData = mHandleMap.getRequestDataByRequestId(requestId);
-            if (requestData != null) {
-                handle = requestData.handle();
-                connId = requestData.connId();
-            } else {
-                connId = mServerMap.connIdByAddress(serverIf, address);
-            }
+            connId = mServerMap.connIdByAddress(serverIf, address);
         }
+
         mNativeInterface.gattServerSendResponse(
                 serverIf,
                 connId != null ? connId : 0,
diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index 6748387139..9dcdcd4b2b 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -70,16 +70,6 @@ flag {
 }
 
 flag {
-    name: "gatt_server_requests_fix"
-    namespace: "bluetooth"
-    description: "Fix GATT server handling"
-    bug: "361331170"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "le_scan_msft_support"
     namespace: "bluetooth"
     description: "Support MSFT HCI extension for LE Scanning. go/bt-msft-aosp-dd"