5 files changed, 10 insertions, 35 deletions
diff --git a/flags/Android.bp b/flags/Android.bp
index 80a57891a5..6f1e67e262 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -34,7 +34,6 @@ aconfig_declarations {
         "le_scanning.aconfig",
         "leaudio.aconfig",
         "mapclient.aconfig",
-        "mcp.aconfig",
         "metric.aconfig",
         "opp.aconfig",
         "pairing.aconfig",
diff --git a/flags/BUILD.gn b/flags/BUILD.gn
index da5aa8621b..a53cb379fe 100644
--- a/flags/BUILD.gn
+++ b/flags/BUILD.gn
@@ -27,7 +27,6 @@ aconfig("bluetooth_flags_c_lib") {
     "le_scanning.aconfig",
     "leaudio.aconfig",
     "mapclient.aconfig",
-    "mcp.aconfig",
     "metric.aconfig",
     "opp.aconfig",
     "pairing.aconfig",
diff --git a/flags/active_device_manager.aconfig b/flags/active_device_manager.aconfig
index b2438be452..bd55d35e16 100644
--- a/flags/active_device_manager.aconfig
+++ b/flags/active_device_manager.aconfig
@@ -2,26 +2,6 @@ package: "com.android.bluetooth.flags"
 container: "com.android.bt"
 
 flag {
-    name: "adm_verify_active_fallback_device"
-    namespace: "bluetooth"
-    description: "Verify if device selected for fallback is different then last one"
-    bug: "369799111"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
-    name: "adm_fix_disconnect_of_set_member"
-    namespace: "bluetooth"
-    description: "Fix disconnecting of the set member device. Make sure the other set member is not considered as fallback device."
-    bug: "374320313"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "adm_remove_handling_wired"
     namespace: "bluetooth"
     description: "ActiveDeviceManager doesn't need to handle adding and removing wired devices."
diff --git a/flags/gap.aconfig b/flags/gap.aconfig
index 856f4f7bb4..1124679d42 100644
--- a/flags/gap.aconfig
+++ b/flags/gap.aconfig
@@ -270,3 +270,13 @@ flag {
     description: "Add RSSI ScanFilter"
     bug: "404986559"
 }
+
+flag {
+    name: "fix_private_gatt_advertising_not_working"
+    namespace: "bluetooth"
+    description: "Fix that private GATT advertising is handled as a normal GATT"
+    bug: "405315235"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
diff --git a/flags/mcp.aconfig b/flags/mcp.aconfig
deleted file mode 100644
index 80567acae7..0000000000
--- a/flags/mcp.aconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-package: "com.android.bluetooth.flags"
-container: "com.android.bt"
-
-flag {
-    name: "mcp_allow_play_without_active_player"
-    namespace: "bluetooth"
-    description: "Handle LeAudio play same as in AVRCP in case player is not active"
-    bug: "337169240"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-
-}