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

Commit de2fca6a authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes If90635dd,I025a23a0 into main 

* changes:
  Trunk Stable/HapClient: Use static flagging
  Trunk Stable/HeadsetService: Use static flagging
parents b42808e4 07e1f7d8

android/app/src/com/android/bluetooth/hap/HapClientService.java

+2 −5
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ import com.android.bluetooth.btservice.ProfileService; 
import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.flags.FeatureFlags;

import com.android.bluetooth.flags.FeatureFlagsImpl;

import com.android.bluetooth.flags.Flags;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.SynchronousResultReceiver;
@@ -89,7 +88,6 @@ public class HapClientService extends ProfileService { 
    private final Map<BluetoothDevice, Integer> mDeviceFeaturesMap = new HashMap<>();

    private final Map<BluetoothDevice, List<BluetoothHapPresetInfo>> mPresetsMap =

            new HashMap<>();

    private final FeatureFlags mFeatureFlags;



    @VisibleForTesting

    RemoteCallbackList<IBluetoothHapClientCallback> mCallbacks;
@@ -129,7 +127,6 @@ public class HapClientService extends ProfileService { 
    public HapClientService(AdapterService adapterService) {

        super(adapterService);

        mAdapterService = Objects.requireNonNull(adapterService);

        mFeatureFlags = new FeatureFlagsImpl();

    }



    @Override
@@ -440,7 +437,7 @@ public class HapClientService extends ProfileService { 
                removeStateMachine(device);

            }

        }

        if (!mFeatureFlags.audioRoutingCentralization()) {

        if (!Flags.audioRoutingCentralization()) {

            ActiveDeviceManager adManager = mAdapterService.getActiveDeviceManager();

            if (adManager != null) {

                adManager.profileConnectionStateChanged(

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

+2 −4
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ import com.android.bluetooth.btservice.MetricsLogger; 
import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.flags.FeatureFlags;

import com.android.bluetooth.flags.FeatureFlagsImpl;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.hfpclient.HeadsetClientService;

import com.android.bluetooth.hfpclient.HeadsetClientStateMachine;

import com.android.bluetooth.le_audio.LeAudioService;
@@ -126,7 +125,6 @@ public class HeadsetService extends ProfileService { 
    // Timeout for state machine thread join, to prevent potential ANR.

    private static final int SM_THREAD_JOIN_TIMEOUT_MS = 1000;



    private FeatureFlags mFeatureFlags = new FeatureFlagsImpl();

    private int mMaxHeadsetConnections = 1;

    private BluetoothDevice mActiveDevice;

    private AdapterService mAdapterService;
@@ -851,7 +849,7 @@ public class HeadsetService extends ProfileService { 
            try {

                HeadsetService service = getService(source);

                if (service != null) {

                    if (service.mFeatureFlags.audioRoutingCentralization()) {

                    if (Flags.audioRoutingCentralization()) {

                        ((AudioRoutingManager) service.mAdapterService.getActiveDeviceManager())

                                .activateDeviceProfile(device, BluetoothProfile.HEADSET, receiver);

                    } else {