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

Commit aa575a0b authored by Jakub Rotkiewicz (xWF)'s avatar Jakub Rotkiewicz (xWF) Committed by Gerrit Code Review
Browse files

Merge "flag: rename adm_always_fallback_to_available_device" into main

parents 5677d419 4c30e561

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

+2 −2
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
            if (Objects.equals(a2dpFallbackDevice, device)) {

                Log.d(TAG, "Found an A2DP fallback device: " + device);

                setA2dpActiveDevice(device);

                if (Flags.alwaysFallbackToAvailableDevice()) {

                if (Flags.admAlwaysFallbackToAvailableDevice()) {

                    setHfpActiveDevice(headsetFallbackDevice);

                } else {

                    if (Objects.equals(headsetFallbackDevice, device)) {
@@ -1152,7 +1152,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
            if (Objects.equals(headsetFallbackDevice, device)) {

                Log.d(TAG, "Found a HFP fallback device: " + device);

                setHfpActiveDevice(device);

                if (Flags.alwaysFallbackToAvailableDevice()) {

                if (Flags.admAlwaysFallbackToAvailableDevice()) {

                    setA2dpActiveDevice(a2dpFallbackDevice);

                } else {

                    if (Objects.equals(a2dpFallbackDevice, device)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ public class ActiveDeviceManagerTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ALWAYS_FALLBACK_TO_AVAILABLE_DEVICE)

    @EnableFlags(Flags.FLAG_ADM_ALWAYS_FALLBACK_TO_AVAILABLE_DEVICE)

    public void a2dpHeadsetActivated_checkFallbackMeachanismOneA2dpOneHeadset() {

        // Active call

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

flags/active_device_manager.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ flag { 
}



flag {

    name: "always_fallback_to_available_device"

    name: "adm_always_fallback_to_available_device"

    namespace: "bluetooth"

    description: "Fix audio path and always fallback to available device"

    bug: "351820274"