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

Commit 57733640 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Sanket Agarwal
Browse files

Bluetooth Connect Other Profiles 

Rework the logic in connectOtherProfiles to support both client and
server based profiles.  This logic is invoked 6 seconds after a
successful bluetooth connection is established to attempt to connect any
other valid profiles.

bug: 28249138
Change-Id: I6cc77f47a522da134af3122c07095e1a4f583f32
(cherry picked from commit 71669e2bfde4f3c76f3f93d9e118793b4eb79dfa)
parent 752bb520

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

+66 −19
Original line number Diff line number Diff line
@@ -1747,37 +1747,84 @@ public class AdapterService extends Service { 
        }

    }



    // This function is called whenever a profile is connected.  This allows any other bluetooth

    // profiles which are not already connected or in the process of connecting to attempt to

    // connect to the device that initiated the connection.  In the event that this function is

    // invoked and there are no current bluetooth connections no new profiles will be connected.

    private void processConnectOtherProfiles (BluetoothDevice device, int firstProfileStatus) {

        if (getState()!= BluetoothAdapter.STATE_ON){

            return;

        }

        HeadsetService  hsService = HeadsetService.getHeadsetService();

        A2dpService a2dpService = A2dpService.getA2dpService();

        HeadsetClientService headsetClientService = HeadsetClientService.getHeadsetClientService();

        A2dpSinkService a2dpSinkService = A2dpSinkService.getA2dpSinkService();

        PbapClientService pbapClientService = PbapClientService.getPbapClientService();



        // if any of the profile service is  null, second profile connection not required

        if ((hsService == null) ||(a2dpService == null )){

            return;

        boolean allProfilesEmpty = true;

        List<BluetoothDevice> a2dpConnDevList = null;

        List<BluetoothDevice> hsConnDevList = null;

        List<BluetoothDevice> headsetClientConnDevList = null;

        List<BluetoothDevice> a2dpSinkConnDevList = null;

        List<BluetoothDevice> pbapClientConnDevList = null;



        if (hsService != null) {

            hsConnDevList = hsService.getConnectedDevices();

            allProfilesEmpty = allProfilesEmpty && hsConnDevList.isEmpty();

        }

        if (a2dpService != null) {

            a2dpConnDevList = a2dpService.getConnectedDevices();

            allProfilesEmpty = allProfilesEmpty && a2dpConnDevList.isEmpty();

        }

        List<BluetoothDevice> a2dpConnDevList= a2dpService.getConnectedDevices();

        List<BluetoothDevice> hfConnDevList= hsService.getConnectedDevices();

        // Check if the device is in disconnected state and if so return

        // We ned to connect other profile only if one of the profile is still in connected state

        // This is required to avoide a race condition in which profiles would

        // automaticlly connect if the disconnection is initiated within 6 seconds of connection

        //First profile connection being rejected is an exception

        if((hfConnDevList.isEmpty() && a2dpConnDevList.isEmpty())&&

            (PROFILE_CONN_CONNECTED  == firstProfileStatus)){

        if (headsetClientService != null) {

            headsetClientConnDevList = headsetClientService.getConnectedDevices();

            allProfilesEmpty = allProfilesEmpty && headsetClientConnDevList.isEmpty();

        }

        if (a2dpSinkService != null) {

            a2dpSinkConnDevList = a2dpSinkService.getConnectedDevices();

            allProfilesEmpty = allProfilesEmpty && a2dpSinkConnDevList.isEmpty();

        }

        if (pbapClientService != null) {

            pbapClientConnDevList = pbapClientService.getConnectedDevices();

            allProfilesEmpty = allProfilesEmpty && pbapClientConnDevList.isEmpty();

        }



        if (allProfilesEmpty && (PROFILE_CONN_CONNECTED  == firstProfileStatus)) {

            // must have connected then disconnected, don't bother connecting others.

            return;

        }

        if((hfConnDevList.isEmpty()) &&



        if (hsService != null) {

            if (hsConnDevList.isEmpty() &&

                  (hsService.getPriority(device) >= BluetoothProfile.PRIORITY_ON)) {

                  hsService.connect(device);

            }

        else if((a2dpConnDevList.isEmpty()) &&

        }

        if (a2dpService != null) {

            if (a2dpConnDevList.isEmpty() &&

                (a2dpService.getPriority(device) >= BluetoothProfile.PRIORITY_ON)) {

                a2dpService.connect(device);

            }

        }

        if (headsetClientService != null) {

            if (headsetClientConnDevList.isEmpty() &&

                (headsetClientService.getPriority(device) >= BluetoothProfile.PRIORITY_ON)) {

                headsetClientService.connect(device);

            }

        }

        if (a2dpSinkService != null) {

            if (a2dpSinkConnDevList.isEmpty() &&

                (a2dpSinkService.getPriority(device) >= BluetoothProfile.PRIORITY_ON)) {

                a2dpSinkService.connect(device);

            }

        }

        if (pbapClientService != null) {

            if (pbapClientConnDevList.isEmpty() &&

                (pbapClientService.getPriority(device) >= BluetoothProfile.PRIORITY_ON)) {

                pbapClientService.connect(device);

            }

        }

    }



     private void adjustOtherHeadsetPriorities(HeadsetService  hsService,

             List<BluetoothDevice> connectedDeviceList) {