Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c58ece authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

Remove leaudio_active_device_manager_group_handling_fix flag 

Bug: 316958532
Bug: 324364321
Test: atest ActiveDeviceManagerTest
Flag: com.android.bluetooth.flags.leaudio_active_device_manager_group_handling_fix
Change-Id: I7a6882cc11d47f2772a23d8a795c79cceb470e02
parent e6ffd60c

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+6 −12
Original line number Diff line number Diff line
@@ -993,14 +993,12 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
            if (device == null) {

                success = leAudioService.removeActiveDevice(hasFallbackDevice);

            } else {

                if (Flags.leaudioActiveDeviceManagerGroupHandlingFix()) {

                if ((mLeAudioActiveDevice != null)

                        && (Objects.equals(

                                mLeAudioActiveDevice, leAudioService.getLeadDevice(device)))) {

                    Log.d(TAG, "New LeAudioDevice is a part of an active group");

                    return true;

                }

                }

                success = leAudioService.setActiveDevice(device);

            }
@@ -1008,11 +1006,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                return false;

            }



            if (Flags.leaudioActiveDeviceManagerGroupHandlingFix()) {

            mLeAudioActiveDevice = leAudioService.getLeadDevice(device);

            } else {

                mLeAudioActiveDevice = device;

            }



            if (device == null) {

                mLeHearingAidActiveDevice = null;

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -900,7 +900,6 @@ public class ActiveDeviceManagerTest { 


    @Test

    public void leAudioSetConnectedGroupThenDisconnected_noFallback() {

        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_ACTIVE_DEVICE_MANAGER_GROUP_HANDLING_FIX);

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);



        leAudioConnected(mLeAudioDevice);

flags/leaudio.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ flag { 
    bug: "323156655"

}



flag {

    name: "leaudio_active_device_manager_group_handling_fix"

    namespace: "bluetooth"

    description: "Make sure Active Device Manager understands LeAudio groups"

    bug: "324364321"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "leaudio_start_stream_race_fix"

    namespace: "bluetooth"