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

Commit 7412edb6 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "BondStateMachine: Clear connection policy for LeAudio services" into... 

Merge "BondStateMachine: Clear connection policy for LeAudio services" into main am: d6933f77 am: 881c8680

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



Change-Id: I3b96ca90c7269382d65e4aa63892602d915ccd49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6779ca96 881c8680

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

+24 −0
Original line number Diff line number Diff line
@@ -38,11 +38,15 @@ import com.android.bluetooth.Utils; 
import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.a2dpsink.A2dpSinkService;

import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.hap.HapClientService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hfpclient.HeadsetClientService;

import com.android.bluetooth.hid.HidHostService;

import com.android.bluetooth.le_audio.LeAudioService;

import com.android.bluetooth.pbapclient.PbapClientService;

import com.android.bluetooth.vc.VolumeControlService;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;
@@ -691,6 +695,11 @@ final class BondStateMachine extends StateMachine { 
        HeadsetClientService headsetClientService = HeadsetClientService.getHeadsetClientService();

        A2dpSinkService a2dpSinkService = A2dpSinkService.getA2dpSinkService();

        PbapClientService pbapClientService = PbapClientService.getPbapClientService();

        LeAudioService leAudioService = LeAudioService.getLeAudioService();

        CsipSetCoordinatorService csipSetCoordinatorService =

                CsipSetCoordinatorService.getCsipSetCoordinatorService();

        VolumeControlService volumeControlService = VolumeControlService.getVolumeControlService();

        HapClientService hapClientService = HapClientService.getHapClientService();



        if (hidService != null) {

            hidService.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_UNKNOWN);
@@ -712,6 +721,21 @@ final class BondStateMachine extends StateMachine { 
            pbapClientService.setConnectionPolicy(device,

                    BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        }

        if (leAudioService != null) {

            leAudioService.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        }

        if (csipSetCoordinatorService != null) {

            csipSetCoordinatorService.setConnectionPolicy(

                    device, BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        }

        if (volumeControlService != null) {

            volumeControlService.setConnectionPolicy(

                    device, BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        }

        if (hapClientService != null) {

            hapClientService.setConnectionPolicy(

                    device, BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

        }

    }



    private String state2str(int state) {