flag: Remove leaudio_unicast_no_available_contexts flag

Flag has been delivered

Bug: 367325041
Test: mmm packages/modules/Bluetooth
Flag: EXEMPT, flag cleanup
Change-Id: Ib0decd98bfadbcc4098912bfac77922ad7648c1a

3 files changed, 2 insertions, 17 deletions

diff --git a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
index 3576d07c3c..54ced65311 100644
--- a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
+++ b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
@@ -348,7 +348,7 @@ public class LeAudioService extends ProfileService {
             mLostLeadDeviceWhileStreaming = null;
             mCurrentLeadDevice = null;
             mInbandRingtoneEnabled = isInbandRingtoneEnabled;
-            mAvailableContexts = Flags.leaudioUnicastNoAvailableContexts() ? null : 0;
+            mAvailableContexts = null;
             mInputSelectableConfig = new ArrayList<>();
             mOutputSelectableConfig = new ArrayList<>();
             mInactivatedDueToContextType = false;
@@ -4342,8 +4342,7 @@ public class LeAudioService extends ProfileService {
             if (getConnectedPeerDevices(groupId).isEmpty()) {
                 descriptor.mIsConnected = false;
                 descriptor.mAutoActiveModeEnabled = true;
-                descriptor.mAvailableContexts =
-                        Flags.leaudioUnicastNoAvailableContexts() ? null : 0;
+                descriptor.mAvailableContexts = null;
                 if (descriptor.isActive()) {
                     /* Notify Native layer */
                     removeActiveDevice(hasFallbackDevice);
diff --git a/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java b/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
index 77f42a6100..46255e6657 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
@@ -210,7 +210,6 @@ public class LeAudioServiceTest {
     public static List<FlagsParameterization> getParams() {
         return FlagsParameterization.progressionOf(
                 Flags.FLAG_LEAUDIO_BROADCAST_PRIMARY_GROUP_SELECTION,
-                Flags.FLAG_LEAUDIO_UNICAST_NO_AVAILABLE_CONTEXTS,
                 Flags.FLAG_LEAUDIO_BROADCAST_API_MANAGE_PRIMARY_GROUP,
                 Flags.FLAG_DO_NOT_HARDCODE_TMAP_ROLE_MASK);
     }
@@ -2835,7 +2834,6 @@ public class LeAudioServiceTest {
      * </pre>
      */
     @Test
-    @EnableFlags(Flags.FLAG_LEAUDIO_UNICAST_NO_AVAILABLE_CONTEXTS)
     public void testActivateGroupWhenAvailableContextAreBack_Scenario1() {
         int groupId = 1;
         /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */
@@ -2919,7 +2917,6 @@ public class LeAudioServiceTest {
      * </pre>
      */
     @Test
-    @EnableFlags(Flags.FLAG_LEAUDIO_UNICAST_NO_AVAILABLE_CONTEXTS)
     public void testActivateDeviceWhenAvailableContextAreBack_Scenario2() {
         int groupId = 1;
         /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */
@@ -3017,7 +3014,6 @@ public class LeAudioServiceTest {
      *  4. The available contexts are updated with non-zero value. Group becomes active.
      */
     @Test
-    @EnableFlags(Flags.FLAG_LEAUDIO_UNICAST_NO_AVAILABLE_CONTEXTS)
     public void testActivateDeviceWhenAvailableContextAreBack_Scenario3() {
         int groupId = 1;
         /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */
diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig
index 5675f8e795..0c005a3463 100644
--- a/flags/leaudio.aconfig
+++ b/flags/leaudio.aconfig
@@ -130,16 +130,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"