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

Commit d7670ba1 authored by Jakub Rotkiewicz (xWF)'s avatar Jakub Rotkiewicz (xWF) Committed by Automerger Merge Worker
Browse files

Merge "flag: rename adm_fallback_when_wired_audio_disconnected" into main am:... 

Merge "flag: rename adm_fallback_when_wired_audio_disconnected" into main am: 5677d419 am: 96b0e3c6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3204515



Change-Id: Ibce215b6f946c61c92357d55e8f8fd08da5cf9ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c8b8c2d 96b0e3c6

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

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
        @Override

        public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {

            Log.d(TAG, "onAudioDevicesRemoved");

            if (!Flags.fallbackWhenWiredAudioDisconnected()) {

            if (!Flags.admFallbackWhenWiredAudioDisconnected()) {

                return;

            }

            if (!Arrays.stream(removedDevices)

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

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


    /** A wired audio device is disconnected. Check if falls back to connected A2DP. */

    @Test

    @EnableFlags(Flags.FLAG_FALLBACK_WHEN_WIRED_AUDIO_DISCONNECTED)

    @EnableFlags(Flags.FLAG_ADM_FALLBACK_WHEN_WIRED_AUDIO_DISCONNECTED)

    public void wiredAudioDeviceDisconnected_setFallbackDevice() throws Exception {

        AudioDeviceInfo[] testDevices = createAudioDeviceInfoTestDevices();

flags/active_device_manager.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package: "com.android.bluetooth.flags" 
container: "com.android.btservices"



flag {

    name: "fallback_when_wired_audio_disconnected"

    name: "adm_fallback_when_wired_audio_disconnected"

    namespace: "bluetooth"

    description: "Fallback to other connected device when wired audio device disconnects"

    bug: "348124361"