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

Commit 45a477e2 authored by timhypeng's avatar timhypeng Committed by tim peng
Browse files

reduce the usage of LocalBluetoothAdapter in LocalBluetoothProfileManager 

- LocalBluetoothAdapter is only for setProfileManager() to refresh profiles when Bluetooth turned back on
- use BluetoothAdapter.getDefaultAdapter() to call getSupportedProfiles()
- add ShadowBluetoothAdapter.java to handle the test cast without mock adapter
- no more pass LocalBluetoothAdapter to each Bluetooth profile
- no more pass LocalBluetoothAdapter to CachedBluetoothDeviceManager::addDevice()

Bug: 111815935
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I87f328b04cfe86bbd42babb57187e7c0b2638aea
parent 345a4af9

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+15 −17
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.bluetooth; 


import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothA2dpSink;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;

import android.bluetooth.BluetoothHeadsetClient;
@@ -79,7 +80,6 @@ public class LocalBluetoothProfileManager { 
    }



    private final Context mContext;

    private final LocalBluetoothAdapter mLocalAdapter;

    private final CachedBluetoothDeviceManager mDeviceManager;

    private final BluetoothEventManager mEventManager;
@@ -111,14 +111,13 @@ public class LocalBluetoothProfileManager { 
            BluetoothEventManager eventManager) {

        mContext = context;



        mLocalAdapter = adapter;

        mDeviceManager = deviceManager;

        mEventManager = eventManager;

        mUsePbapPce = mContext.getResources().getBoolean(R.bool.enable_pbap_pce_profile);

        // MAP Client is typically used in the same situations as PBAP Client

        mUseMapClient = mContext.getResources().getBoolean(R.bool.enable_pbap_pce_profile);

        // pass this reference to adapter and event manager (circular dependency)

        mLocalAdapter.setProfileManager(this);

        adapter.setProfileManager(this);



        updateLocalProfiles();

        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
@@ -128,26 +127,26 @@ public class LocalBluetoothProfileManager { 
     * create profile instance according to bluetooth supported profile list

     */

    void updateLocalProfiles() {

        List<Integer> supportedList = mLocalAdapter.getSupportedProfiles();

        List<Integer> supportedList = BluetoothAdapter.getDefaultAdapter().getSupportedProfiles();

        if (CollectionUtils.isEmpty(supportedList)) {

            if(DEBUG) Log.d(TAG, "supportedList is null");

            return;

        }

        if (mA2dpProfile == null && supportedList.contains(BluetoothProfile.A2DP)) {

            if(DEBUG) Log.d(TAG, "Adding local A2DP profile");

            mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mA2dpProfile = new A2dpProfile(mContext, mDeviceManager, this);

            addProfile(mA2dpProfile, A2dpProfile.NAME,

                    BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mA2dpSinkProfile == null && supportedList.contains(BluetoothProfile.A2DP_SINK)) {

            if(DEBUG) Log.d(TAG, "Adding local A2DP SINK profile");

            mA2dpSinkProfile = new A2dpSinkProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mA2dpSinkProfile = new A2dpSinkProfile(mContext, mDeviceManager, this);

            addProfile(mA2dpSinkProfile, A2dpSinkProfile.NAME,

                    BluetoothA2dpSink.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mHeadsetProfile == null && supportedList.contains(BluetoothProfile.HEADSET)) {

            if (DEBUG) Log.d(TAG, "Adding local HEADSET profile");

            mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mHeadsetProfile = new HeadsetProfile(mContext, mDeviceManager, this);

            addHeadsetProfile(mHeadsetProfile, HeadsetProfile.NAME,

                    BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED,

                    BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED,
@@ -155,7 +154,7 @@ public class LocalBluetoothProfileManager { 
        }

        if (mHfpClientProfile == null && supportedList.contains(BluetoothProfile.HEADSET_CLIENT)) {

            if(DEBUG) Log.d(TAG, "Adding local HfpClient profile");

            mHfpClientProfile = new HfpClientProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mHfpClientProfile = new HfpClientProfile(mContext, mDeviceManager, this);

            addHeadsetProfile(mHfpClientProfile, HfpClientProfile.NAME,

                    BluetoothHeadsetClient.ACTION_CONNECTION_STATE_CHANGED,

                    BluetoothHeadsetClient.ACTION_AUDIO_STATE_CHANGED,
@@ -165,13 +164,13 @@ public class LocalBluetoothProfileManager { 
            if (mMapClientProfile == null && supportedList.contains(BluetoothProfile.MAP_CLIENT)) {

                if(DEBUG) Log.d(TAG, "Adding local MAP CLIENT profile");

                mMapClientProfile =

                        new MapClientProfile(mContext, mLocalAdapter, mDeviceManager,this);

                        new MapClientProfile(mContext, mDeviceManager,this);

                addProfile(mMapClientProfile, MapClientProfile.NAME,

                        BluetoothMapClient.ACTION_CONNECTION_STATE_CHANGED);

            }

        } else if (mMapProfile == null && supportedList.contains(BluetoothProfile.MAP)) {

            if(DEBUG) Log.d(TAG, "Adding local MAP profile");

            mMapProfile = new MapProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mMapProfile = new MapProfile(mContext, mDeviceManager, this);

            addProfile(mMapProfile, MapProfile.NAME, BluetoothMap.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mOppProfile == null && supportedList.contains(BluetoothProfile.OPP)) {
@@ -182,26 +181,26 @@ public class LocalBluetoothProfileManager { 
        }

        if (mHearingAidProfile == null && supportedList.contains(BluetoothProfile.HEARING_AID)) {

            if(DEBUG) Log.d(TAG, "Adding local Hearing Aid profile");

            mHearingAidProfile = new HearingAidProfile(mContext, mLocalAdapter, mDeviceManager,

            mHearingAidProfile = new HearingAidProfile(mContext, mDeviceManager,

                    this);

            addProfile(mHearingAidProfile, HearingAidProfile.NAME,

                    BluetoothHearingAid.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mHidProfile == null && supportedList.contains(BluetoothProfile.HID_HOST)) {

            if(DEBUG) Log.d(TAG, "Adding local HID_HOST profile");

            mHidProfile = new HidProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mHidProfile = new HidProfile(mContext, mDeviceManager, this);

            addProfile(mHidProfile, HidProfile.NAME,

                    BluetoothHidHost.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mHidDeviceProfile == null && supportedList.contains(BluetoothProfile.HID_DEVICE)) {

            if(DEBUG) Log.d(TAG, "Adding local HID_DEVICE profile");

            mHidDeviceProfile = new HidDeviceProfile(mContext, mLocalAdapter, mDeviceManager, this);

            mHidDeviceProfile = new HidDeviceProfile(mContext, mDeviceManager, this);

            addProfile(mHidDeviceProfile, HidDeviceProfile.NAME,

                    BluetoothHidDevice.ACTION_CONNECTION_STATE_CHANGED);

        }

        if (mPanProfile == null && supportedList.contains(BluetoothProfile.PAN)) {

            if(DEBUG) Log.d(TAG, "Adding local PAN profile");

            mPanProfile = new PanProfile(mContext, mLocalAdapter);

            mPanProfile = new PanProfile(mContext);

            addPanProfile(mPanProfile, PanProfile.NAME,

                    BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);

        }
@@ -214,8 +213,7 @@ public class LocalBluetoothProfileManager { 
        if (mUsePbapPce && mPbapClientProfile == null && supportedList.contains(

                BluetoothProfile.PBAP_CLIENT)) {

            if(DEBUG) Log.d(TAG, "Adding local PBAP Client profile");

            mPbapClientProfile = new PbapClientProfile(mContext, mLocalAdapter, mDeviceManager,

                    this);

            mPbapClientProfile = new PbapClientProfile(mContext, mDeviceManager,this);

            addProfile(mPbapClientProfile, PbapClientProfile.NAME,

                    BluetoothPbapClient.ACTION_CONNECTION_STATE_CHANGED);

        }
@@ -271,7 +269,7 @@ public class LocalBluetoothProfileManager { 
            CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);

            if (cachedDevice == null) {

                Log.w(TAG, "StateChangedHandler found new device: " + device);

                cachedDevice = mDeviceManager.addDevice(mLocalAdapter, device);

                cachedDevice = mDeviceManager.addDevice(device);

            }

            onReceiveInternal(intent, cachedDevice);

        }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java

+9 −13
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothCodecConfig;

import android.bluetooth.BluetoothCodecStatus;

import android.bluetooth.BluetoothDevice;
@@ -33,21 +33,23 @@ import android.content.res.Resources; 


import com.android.settingslib.R;

import com.android.settingslib.SettingsLibRobolectricTestRunner;

import com.android.settingslib.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;



@RunWith(SettingsLibRobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothAdapter.class})

public class A2dpProfileTest {



    @Mock

    Context mContext;

    @Mock

    LocalBluetoothAdapter mAdapter;

    @Mock

    CachedBluetoothDeviceManager mDeviceManager;

    @Mock

    LocalBluetoothProfileManager mProfileManager;
@@ -58,20 +60,14 @@ public class A2dpProfileTest { 
    BluetoothProfile.ServiceListener mServiceListener;



    A2dpProfile mProfile;

    private ShadowBluetoothAdapter mShadowBluetoothAdapter;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        // Capture the A2dpServiceListener our A2dpProfile will pass during its constructor, so that

        // we can call its onServiceConnected method and get it to use our mock BluetoothA2dp

        // object.

        doAnswer((invocation) -> {

            mServiceListener = (BluetoothProfile.ServiceListener) invocation.getArguments()[1];

            return null;

        }).when(mAdapter).getProfileProxy(any(Context.class), any(), eq(BluetoothProfile.A2DP));



        mProfile = new A2dpProfile(mContext, mAdapter, mDeviceManager, mProfileManager);

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mProfile = new A2dpProfile(mContext, mDeviceManager, mProfileManager);

        mServiceListener = mShadowBluetoothAdapter.getServiceListener();

        mServiceListener.onServiceConnected(BluetoothProfile.A2DP, mBluetoothA2dp);

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java

+35 −71
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.doAnswer; 
import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;
@@ -59,8 +58,6 @@ public class CachedBluetoothDeviceManagerTest { 
    private final BluetoothClass DEVICE_CLASS_2 =

        new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);

    @Mock

    private LocalBluetoothAdapter mLocalAdapter;

    @Mock

    private LocalBluetoothProfileManager mLocalProfileManager;

    @Mock

    private LocalBluetoothManager mLocalBluetoothManager;
@@ -110,18 +107,17 @@ public class CachedBluetoothDeviceManagerTest { 


        when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);

        when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalProfileManager);

        when(mLocalAdapter.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);

        when(mHfpProfile.isProfileReady()).thenReturn(true);

        when(mA2dpProfile.isProfileReady()).thenReturn(true);

        when(mPanProfile.isProfileReady()).thenReturn(true);

        when(mHearingAidProfile.isProfileReady()).thenReturn(true);

        mCachedDeviceManager = new CachedBluetoothDeviceManager(mContext, mLocalBluetoothManager);

        mCachedDevice1 = spy(

            new CachedBluetoothDevice(mContext, mLocalAdapter, mLocalProfileManager, mDevice1));

            new CachedBluetoothDevice(mContext, mLocalProfileManager, mDevice1));

        mCachedDevice2 = spy(

            new CachedBluetoothDevice(mContext, mLocalAdapter, mLocalProfileManager, mDevice2));

            new CachedBluetoothDevice(mContext, mLocalProfileManager, mDevice2));

        mCachedDevice3 = spy(

            new CachedBluetoothDevice(mContext, mLocalAdapter, mLocalProfileManager, mDevice3));

            new CachedBluetoothDevice(mContext, mLocalProfileManager, mDevice3));

    }



    /**
@@ -129,11 +125,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testAddDevice_validCachedDevices_devicesAdded() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        Collection<CachedBluetoothDevice> devices = mCachedDeviceManager.getCachedDevicesCopy();
@@ -149,8 +143,7 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testGetName_validCachedDevice_nameFound() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(mCachedDeviceManager.getName(mDevice1)).isEqualTo(DEVICE_ALIAS_1);

    }
@@ -160,8 +153,7 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnDeviceNameUpdated_validName_nameUpdated() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(cachedDevice1.getName()).isEqualTo(DEVICE_ALIAS_1);
@@ -176,11 +168,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testClearNonBondedDevices_bondedAndNonBondedDevices_nonBondedDevicesCleared() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
@@ -231,11 +221,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnHiSyncIdChanged_sameHiSyncId_populateInDifferentLists() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        // Since both devices do not have hiSyncId, they should be added in mCachedDevices.
@@ -266,11 +254,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnHiSyncIdChanged_sameHiSyncIdAndOneConnected_chooseConnectedDevice() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        cachedDevice1.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);

        cachedDevice2.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
@@ -303,11 +289,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnHiSyncIdChanged_differentHiSyncId_populateInSameList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        // Since both devices do not have hiSyncId, they should be added in mCachedDevices.
@@ -339,8 +323,7 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnProfileConnectionStateChanged_singleDeviceConnected_visible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        cachedDevice1.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
@@ -377,11 +360,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnProfileConnectionStateChanged_twoDevicesConnected_oneDeviceVisible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        cachedDevice1.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);

        cachedDevice2.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
@@ -431,11 +412,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnProfileConnectionStateChanged_twoDevicesDisconnected_oneDeviceVisible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        cachedDevice1.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);

        cachedDevice2.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
@@ -486,11 +465,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnDeviceUnpaired_bothHearingAidsPaired_removesItsPairFromList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        cachedDevice1.setHiSyncId(HISYNCID1);
@@ -518,14 +495,11 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnDeviceUnpaired_bothHearingAidsNotPaired_doesNotRemoveAnyDeviceFromList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        CachedBluetoothDevice cachedDevice3 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice3);

        CachedBluetoothDevice cachedDevice3 = mCachedDeviceManager.addDevice(mDevice3);

        assertThat(cachedDevice2).isNotNull();



        cachedDevice1.setHiSyncId(HISYNCID1);
@@ -570,8 +544,7 @@ public class CachedBluetoothDeviceManagerTest { 
        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice1);

        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice2);



        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        // The first hearing aid device should be populated in mCachedDevice and

        // mCachedDevicesMapForHearingAids.
@@ -581,8 +554,7 @@ public class CachedBluetoothDeviceManagerTest { 
        assertThat(mCachedDeviceManager.mCachedDevicesMapForHearingAids.values())

            .contains(cachedDevice1);



        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        // The second hearing aid device should be populated in mHearingAidDevicesNotAddedInCache.

        assertThat(mCachedDeviceManager.getCachedDevicesCopy()).hasSize(1);
@@ -599,8 +571,7 @@ public class CachedBluetoothDeviceManagerTest { 
            .getHearingAidProfile();

        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice1);

        doAnswer((invocation) -> HISYNCID2).when(mHearingAidProfile).getHiSyncId(mDevice2);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        // The first hearing aid device should be populated in mCachedDevice and

        // mCachedDevicesMapForHearingAids.
@@ -610,8 +581,7 @@ public class CachedBluetoothDeviceManagerTest { 
        assertThat(mCachedDeviceManager.mCachedDevicesMapForHearingAids.values())

            .contains(cachedDevice1);



        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

            mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();

        // The second hearing aid device should also be populated in mCachedDevice

        // and mCachedDevicesMapForHearingAids as its not a pair of the first one.
@@ -680,8 +650,7 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnBtClassChanged_validBtClass_classChanged() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(cachedDevice1.getBtClass()).isEqualTo(DEVICE_CLASS_1);
@@ -696,8 +665,7 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnDeviceDisappeared_deviceBondedUnbonded_unbondedDeviceDisappeared() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();



        when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
@@ -712,11 +680,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnActiveDeviceChanged_connectedDevices_activeDeviceChanged() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
@@ -777,11 +743,9 @@ public class CachedBluetoothDeviceManagerTest { 
     */

    @Test

    public void testOnActiveDeviceChanged_withA2dpAndHearingAid() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice1);

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mLocalAdapter,

                mDevice2);

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

        assertThat(cachedDevice2).isNotNull();



        when(mDevice1.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+4 −9

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java

+9 −10

File changed.

Preview size limit exceeded, changes collapsed.