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

Commit 0a941556 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

LeAudioService: stop background scan when all devices are connected 

Without this patch, we would keep doing background scan even when all
known devices are connected.

Checking just if state machine is connected is unreliable - lead device state machine after disconnection would still claim to be connected, but the acl is indeed disconnected. Therefore, addition of mAclConnected was needed.

Test: atest LeAudioServiceTest
Bug: 301520529
Change-Id: Ie5712f19487ff9ae2df1d329cd3de37f07cb4a6f
parent 97eb6264

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

+34 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.bluetooth.le_audio; 


import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.bluetooth.IBluetoothLeAudio.LE_AUDIO_GROUP_ID_INVALID;



import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.modules.utils.build.SdkLevel.isAtLeastU;
@@ -198,6 +199,7 @@ public class LeAudioService extends ProfileService { 


    private static class LeAudioDeviceDescriptor {

        LeAudioDeviceDescriptor(boolean isInbandRingtonEnabled) {

            mAclConnected = false;

            mStateMachine = null;

            mGroupId = LE_AUDIO_GROUP_ID_INVALID;

            mSinkAudioLocation = BluetoothLeAudio.AUDIO_LOCATION_INVALID;
@@ -205,6 +207,7 @@ public class LeAudioService extends ProfileService { 
            mDevInbandRingtoneEnabled = isInbandRingtonEnabled;

        }



        public boolean mAclConnected;

        public LeAudioStateMachine mStateMachine;

        public Integer mGroupId;

        public Integer mSinkAudioLocation;
@@ -1272,12 +1275,37 @@ public class LeAudioService extends ProfileService { 
            return false;

        }



        if (allLeAudioDevicesConnected()) {

            Log.d(TAG, "isScannerNeeded: all devices connected, scanner not needed");

            return false;

        }



        if (DBG) {

            Log.d(TAG, "isScannerNeeded: true");

        }

        return true;

    }



    boolean allLeAudioDevicesConnected() {

        synchronized (mGroupLock) {

            for (Map.Entry<BluetoothDevice, LeAudioDeviceDescriptor> deviceEntry :

                    mDeviceDescriptors.entrySet()) {

                LeAudioDeviceDescriptor deviceDescriptor = deviceEntry.getValue();



                if (deviceDescriptor.mStateMachine == null) {

                    /* Lack of state machine means device is not connected */

                    return false;

                }



                if (!deviceDescriptor.mStateMachine.isConnected()

                        || !deviceDescriptor.mAclConnected) {

                    return false;

                }

            }

        }

        return true;

    }



    private class AudioServerScanCallback extends ScanCallback {

        int mMaxScanRetires = 10;

        int mScanRetries = 0;
@@ -2024,6 +2052,7 @@ public class LeAudioService extends ProfileService { 
                    switch (stackEvent.valueInt1) {

                        case LeAudioStackEvent.CONNECTION_STATE_DISCONNECTING:

                        case LeAudioStackEvent.CONNECTION_STATE_DISCONNECTED:

                            deviceDescriptor.mAclConnected = false;

                            startAudioServersBackgroundScan(/* retry = */ false);



                            boolean disconnectDueToUnbond =
@@ -2042,6 +2071,7 @@ public class LeAudioService extends ProfileService { 
                            break;

                        case LeAudioStackEvent.CONNECTION_STATE_CONNECTED:

                        case LeAudioStackEvent.CONNECTION_STATE_CONNECTING:

                            deviceDescriptor.mAclConnected = true;

                            if (descriptor != null

                                    && Objects.equals(

                                            descriptor.mLostLeadDeviceWhileStreaming,
@@ -2060,6 +2090,7 @@ public class LeAudioService extends ProfileService { 
                    switch (stackEvent.valueInt1) {

                        case LeAudioStackEvent.CONNECTION_STATE_CONNECTED:

                        case LeAudioStackEvent.CONNECTION_STATE_CONNECTING:

                            deviceDescriptor.mAclConnected = true;

                            sm = getOrCreateStateMachine(device);

                            /* Incoming connection try to connect other devices from the group */

                            connectSet(device);
@@ -4078,7 +4109,8 @@ public class LeAudioService extends ProfileService { 
                    } else {

                        ProfileService.println(sb, "state machine is null");

                    }



                    ProfileService.println(

                            sb, "    mAclConnected: " + deviceDescriptor.mAclConnected);

                    ProfileService.println(sb, "    mDevInbandRingtoneEnabled: "

                            + deviceDescriptor.mDevInbandRingtoneEnabled);

                    ProfileService.println(sb, "    mSinkAudioLocation: "
@@ -4098,6 +4130,7 @@ public class LeAudioService extends ProfileService { 
                }



                deviceDescriptor.mStateMachine.dump(sb);

                ProfileService.println(sb, "    mAclConnected: " + deviceDescriptor.mAclConnected);

                ProfileService.println(sb, "    mDevInbandRingtoneEnabled: "

                        + deviceDescriptor.mDevInbandRingtoneEnabled);

                ProfileService.println(sb, "    mSinkAudioLocation: "