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

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

Merge "Disable in-band ring if more than one device is connected" am: 5a140ad7 am: 6ce9a26a 

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



Change-Id: I8d3b95169974a6279bc1065e23f94613eebfb64e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d440b34 6ce9a26a

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+1 −2
Original line number Diff line number Diff line
@@ -1896,8 +1896,7 @@ public class HeadsetService extends ProfileService { 
    public void onConnectionStateChangedFromStateMachine(BluetoothDevice device, int fromState,

            int toState) {

        synchronized (mStateMachines) {

            List<BluetoothDevice> audioConnectableDevices =

                    getDevicesMatchingConnectionStates(CONNECTING_CONNECTED_STATES);

            List<BluetoothDevice> audioConnectableDevices = getConnectedDevices();

            if (fromState != BluetoothProfile.STATE_CONNECTED

                    && toState == BluetoothProfile.STATE_CONNECTED) {

                if (audioConnectableDevices.size() > 1) {