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

Commit c93e805c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix setActiveDevice(null)" am: cc28752c am: 80ecfa97 am: e4dce25a... 

Merge "Fix setActiveDevice(null)" am: cc28752c am: 80ecfa97 am: e4dce25a am: 18285999 am: 66408c7d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1878416

Change-Id: I20122c9ed75bca710623b0d02acafb3be52c93ba
parents 3c220f80 66408c7d

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public class BluetoothDeviceManager { 
            for (BluetoothDevice device: mBluetoothAdapter.getActiveDevices(

                        BluetoothProfile.HEARING_AID)) {

                if (device != null) {

                    mBluetoothAdapter.setActiveDevice(null, BluetoothAdapter.ACTIVE_DEVICE_ALL);

                    mBluetoothAdapter.removeActiveDevice(BluetoothAdapter.ACTIVE_DEVICE_ALL);

                }

            }

        }

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
                .thenReturn(Arrays.asList(device2, null));



        mBluetoothDeviceManager.disconnectAudio();

        verify(mAdapter).setActiveDevice(null, BluetoothAdapter.ACTIVE_DEVICE_ALL);

        verify(mAdapter).removeActiveDevice(BluetoothAdapter.ACTIVE_DEVICE_ALL);

        verify(mBluetoothHeadset).disconnectAudio();

    }