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

Commit af5d07bc authored by William Escande's avatar William Escande
Browse files

Trunk Stable/HeadsetService: Use static flagging 

Bug: 323981134
Bug: 300174072
Test: m Bluetooth | mechanical refactor
Change-Id: I025a23a051b94af7315c1d3825fba000b0fa477f
parent 8ebb887d

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 {