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

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

Remove leaudio_quick_leaudio_toggle_switch_fix flag

Bug: 330515834
Bug: 328595942
Test: atest PhonePolicyTest
Flag: com.android.bluetooth.flags.leaudio_quick_leaudio_toggle_switch_fix
Change-Id: Id2f5f5a09af329b2ad46c9fa1aa61946aa0e219d
parent 2ddf7ae8
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -653,7 +653,6 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
                    csipSetCoordinatorService.getGroupDevicesOrdered(
                            csipSetCoordinatorService.getGroupId(device, BluetoothUuid.CAP));

            if (Flags.leaudioQuickLeaudioToggleSwitchFix()) {
            for (BluetoothDevice dev : groupDevices) {
                if (leAudioService.getConnectionPolicy(dev)
                        == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
@@ -662,7 +661,6 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
                }
            }
        }
        }

        boolean isLeAudio = isLeAudioOnlyGroup(device);
        debugLog(
+0 −2
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ public class PhonePolicyTest {
     */
    @Test
    public void testLateConnectOfLeAudioEnabled_DualModeBud() {
        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_QUICK_LEAUDIO_TOGGLE_SWITCH_FIX);
        Utils.setDualModeAudioStateForTesting(false);
        mPhonePolicy.mLeAudioEnabledByDefault = true;
        mPhonePolicy.mAutoConnectProfilesSupported = true;
@@ -624,7 +623,6 @@ public class PhonePolicyTest {

    @Test
    public void testLateConnectOfLeAudioEnabled_AshaAndLeAudioBud() {
        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_QUICK_LEAUDIO_TOGGLE_SWITCH_FIX);
        Utils.setDualModeAudioStateForTesting(false);
        mPhonePolicy.mLeAudioEnabledByDefault = true;
        mPhonePolicy.mAutoConnectProfilesSupported = true;
+0 −10
Original line number Diff line number Diff line
@@ -148,16 +148,6 @@ flag {
    }
}

flag {
    name: "leaudio_quick_leaudio_toggle_switch_fix"
    namespace: "bluetooth"
    description: "Fix for one device being not connected when toggle LeAudio is switch during bonding"
    bug: "328595942"
    metadata {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
    name: "leaudio_getting_active_state_support"
    namespace: "bluetooth"