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

Commit 143e582e authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Clone ActiveDeviceManager to AudioRoutingManager 

With audio_routing_centralization flag, AudioRoutingManager will be used
instead of ActiveDeviceManager.

Bug: 299023147
Test: atest BluetoothInstrumentationTests
Change-Id: Ib34c0b198ce0417fa547a120e1a025a327b61eee
parent 791d8705

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

+3 −1
Original line number Diff line number Diff line
@@ -973,6 +973,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
     *

     * @return true when the fallback device is activated, false otherwise

     */

    @GuardedBy("mLock")

    private boolean setFallbackDeviceActiveLocked() {

        if (DBG) {

            Log.d(TAG, "setFallbackDeviceActive");
@@ -1149,7 +1150,8 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
        return mLeAudioActiveDevice;

    }



    long getHearingAidActiveHiSyncIdLocked() {

    @GuardedBy("mLock")

    private long getHearingAidActiveHiSyncIdLocked() {

        final HearingAidService hearingAidService = mFactory.getHearingAidService();

        if (hearingAidService != null && !mHearingAidActiveDevices.isEmpty()) {

            return hearingAidService.getHiSyncId(mHearingAidActiveDevices.iterator().next());

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

+6 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ import android.util.SparseArray; 


import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.BluetoothStatsLog;

import com.android.bluetooth.Flags;

import com.android.bluetooth.R;

import com.android.bluetooth.Utils;

import com.android.bluetooth.a2dp.A2dpService;
@@ -686,7 +687,11 @@ public class AdapterService extends Service { 
            Log.i(TAG, "Phone policy disabled");

        }



        if (Flags.audioRoutingCentralization()) {

            mActiveDeviceManager = new AudioRoutingManager(this, new ServiceFactory());

        } else {

            mActiveDeviceManager = new ActiveDeviceManager(this, new ServiceFactory());

        }

        mActiveDeviceManager.start();



        mSilenceDeviceManager = new SilenceDeviceManager(this, new ServiceFactory(), mLooper);

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

0 → 100644
+1227 −0

File added.

Preview size limit exceeded, changes collapsed.

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+0 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.media.AudioManager; 
import android.util.ArrayMap;

import android.util.SparseIntArray;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;
@@ -47,7 +46,6 @@ import com.android.bluetooth.TestUtils; 
import com.android.bluetooth.Utils;

import com.android.bluetooth.a2dp.A2dpService;

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

import com.android.bluetooth.hap.HapClientService;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.le_audio.LeAudioService;
@@ -70,7 +68,6 @@ import java.util.Objects; 
@RunWith(AndroidJUnit4.class)

public class ActiveDeviceManagerTest {

    private BluetoothAdapter mAdapter;

    private Context mContext;

    private BluetoothDevice mA2dpDevice;

    private BluetoothDevice mHeadsetDevice;

    private BluetoothDevice mA2dpHeadsetDevice;
@@ -98,11 +95,9 @@ public class ActiveDeviceManagerTest { 
    @Mock private HearingAidService mHearingAidService;

    @Mock private LeAudioService mLeAudioService;

    @Mock private AudioManager mAudioManager;

    @Mock private HapClientService mHapClientService;



    @Before

    public void setUp() throws Exception {

        mContext = InstrumentationRegistry.getTargetContext();

        // Set up mocks and test assets

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);

android/app/tests/unit/src/com/android/bluetooth/btservice/AudioRoutingManagerTest.java

0 → 100644
+1376 −0

File added.

Preview size limit exceeded, changes collapsed.