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

Commit 4b2ec4c3 authored by Alice Kuo's avatar Alice Kuo
Browse files

Move connect/disconnect group from LE audio Service to Setting 

As we do the connect/disconnect inside LE audio Service, it would handle
the LE audio profile only. We should handle it by all profile
connections for the group devices. Move it from profile layer to Setting

Bug: 206049683
Test: connect/disconnect via setting and observe the profile state change
Change-Id: I24228e5d5a45d8163dc9938a6bde09653c8f9258
parent 1e33487f

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+0 −25
Original line number Diff line number Diff line
@@ -364,9 +364,6 @@ public class LeAudioService extends ProfileService { 
            sm.sendMessage(LeAudioStateMachine.CONNECT);

        }



        // Connect other devices from this group

        connectSet(device);



        return true;

    }
@@ -392,28 +389,6 @@ public class LeAudioService extends ProfileService { 
            sm.sendMessage(LeAudioStateMachine.DISCONNECT);

        }



        // Disconnect other devices from this group

        int groupId = getGroupId(device);

        if (groupId != LE_AUDIO_GROUP_ID_INVALID) {

            for (BluetoothDevice storedDevice : mDeviceGroupIdMap.keySet()) {

                if (device.equals(storedDevice)) {

                    continue;

                }

                if (getGroupId(storedDevice) != groupId) {

                    continue;

                }

                synchronized (mStateMachines) {

                    LeAudioStateMachine sm = mStateMachines.get(storedDevice);

                    if (sm == null) {

                        Log.e(TAG, "Ignored disconnect request for " + storedDevice

                                + " : no state machine");

                        continue;

                    }

                    sm.sendMessage(LeAudioStateMachine.DISCONNECT);

                }

            }

        }



        return true;

    }