7 files changed, 10 insertions, 72 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..ebaf40fdb9 100644
--- a/flags/active_device_manager.aconfig
+++ b/flags/active_device_manager.aconfig
@@ -2,16 +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."
diff --git a/flags/adapter.aconfig b/flags/adapter.aconfig
index 0195723932..39e681be16 100644
--- a/flags/adapter.aconfig
+++ b/flags/adapter.aconfig
@@ -9,6 +9,16 @@ flag {
 }
 
 flag {
+    name: "call_bluetooth_ready_before_profiles_start"
+    namespace: "bluetooth"
+    description: "Initiates the adapter properties before starting profiles"
+    bug: "405437771"
+    metadata {
+        purpose: PURPOSE_BUGFIX
+    }
+}
+
+flag {
     name: "empty_names_are_invalid"
     namespace: "bluetooth"
     description: "Make sure the names used in the stack are valid"
diff --git a/flags/hfp.aconfig b/flags/hfp.aconfig
index 9e3bd50b5d..14a91bdc6e 100644
--- a/flags/hfp.aconfig
+++ b/flags/hfp.aconfig
@@ -74,16 +74,6 @@ flag {
 }
 
 flag {
-    name: "update_active_device_in_band_ringtone"
-    namespace: "bluetooth"
-    description: "Active device update the in band ringtone, but how ringtone is played is still decided by the headset"
-    bug: "349318724"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "choose_wrong_hfp_codec_in_specific_config"
     namespace: "bluetooth"
     description: "Flag to fix codec selection in nego when the peer device only support NB and SWB."
diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig
index bc9210e9b4..7a917fbaca 100644
--- a/flags/leaudio.aconfig
+++ b/flags/leaudio.aconfig
@@ -51,16 +51,6 @@ flag {
 }
 
 flag {
-    name: "leaudio_mono_location_errata"
-    namespace: "bluetooth"
-    description: "Add mono location as per Bluetooth Assigned Numbers"
-    bug: "331139722"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "leaudio_mono_location_errata_api"
     is_exported: true
     namespace: "bluetooth"
@@ -69,13 +59,6 @@ flag {
 }
 
 flag {
-    name: "le_audio_support_unidirectional_voice_assistant"
-    namespace: "bluetooth"
-    description: "Allow to create unidirectional stream for VOICEASSISTANT"
-    bug: "332510824"
-}
-
-flag {
     name: "run_clock_recovery_in_worker_thread"
     namespace: "bluetooth"
     description: "Fix thread ownership issue in clock_recovery"
@@ -137,26 +120,6 @@ flag {
 }
 
 flag {
-    name: "leaudio_unicast_no_available_contexts"
-    namespace: "bluetooth"
-    description: "Fix handling initial zero available contexts"
-    bug: "367325041"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
-    name: "leaudio_improve_switch_during_phone_call"
-    namespace: "bluetooth"
-    description: "Fix audio slip to speaker while switching bt audio device during phonecall"
-    bug: "369322905"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "leaudio_sort_scans_to_sync_by_fails"
     namespace: "bluetooth"
     description: "Sort scan results for source sync by fails counter"
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
-    }
-
-}