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

Commit 912a1e9e authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Remove cache of profile status"

parents 31fbd327 bf509058

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

+3 −20
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.settingslib.R; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;

import java.util.HashMap;

import java.util.List;



import androidx.annotation.VisibleForTesting;
@@ -59,7 +58,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    private long mHiSyncId;

    // Need this since there is no method for getting RSSI

    private short mRssi;

    private HashMap<LocalBluetoothProfile, Integer> mProfileConnectionState;



    private final List<LocalBluetoothProfile> mProfiles =

            new ArrayList<LocalBluetoothProfile>();
@@ -101,7 +99,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        mLocalAdapter = BluetoothAdapter.getDefaultAdapter();

        mProfileManager = profileManager;

        mDevice = device;

        mProfileConnectionState = new HashMap<>();

        fillData();

        mHiSyncId = BluetoothHearingAid.HI_SYNC_ID_INVALID;

    }
@@ -134,7 +131,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
            }

            return;

        }

        mProfileConnectionState.put(profile, newProfileState);

        if (newProfileState == BluetoothProfile.STATE_CONNECTED) {

            if (profile instanceof MapProfile) {

                profile.setPreferred(mDevice, true);
@@ -324,22 +320,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    }



    public int getProfileConnectionState(LocalBluetoothProfile profile) {

        if (mProfileConnectionState.get(profile) == null) {

            // If cache is empty make the binder call to get the state

            int state = profile.getConnectionStatus(mDevice);

            mProfileConnectionState.put(profile, state);

        }

        return mProfileConnectionState.get(profile);

    }



    public void clearProfileConnectionState ()

    {

        if (BluetoothUtils.D) {

            Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());

        }

        for (LocalBluetoothProfile profile :getProfiles()) {

            mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);

        }

        return profile != null

                ? profile.getConnectionStatus(mDevice)

                : BluetoothProfile.STATE_DISCONNECTED;

    }



    // TODO: do any of these need to run async on a background thread?

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

+0 −10
Original line number Diff line number Diff line
@@ -285,11 +285,6 @@ public class CachedBluetoothDeviceManager { 
                    {

                        mCachedDevicesMapForHearingAids.remove(cachedDevice.getHiSyncId());

                    }

                } else {

                    // For bonded devices, we need to clear the connection status so that

                    // when BT is enabled next time, device connection status shall be retrieved

                    // by making a binder call.

                    cachedDevice.clearProfileConnectionState();

                }

            }

            for (int i = mHearingAidDevicesNotAddedInCache.size() - 1; i >= 0; i--) {
@@ -297,11 +292,6 @@ public class CachedBluetoothDeviceManager { 
                if (notCachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {

                    notCachedDevice.setJustDiscovered(false);

                    mHearingAidDevicesNotAddedInCache.remove(i);

                } else {

                    // For bonded devices, we need to clear the connection status so that

                    // when BT is enabled next time, device connection status shall be retrieved

                    // by making a binder call.

                    notCachedDevice.clearProfileConnectionState();

                }

            }

        }

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

+3 −2
Original line number Diff line number Diff line
@@ -290,10 +290,11 @@ public class LocalBluetoothProfileManager { 
                }

            }



            mEventManager.dispatchProfileConnectionStateChanged(cachedDevice, newState,

                    mProfile.getProfileId());

            cachedDevice.onProfileStateChanged(mProfile, newState);

            cachedDevice.refresh();

            // Dispatch profile changed after device update

            mEventManager.dispatchProfileConnectionStateChanged(cachedDevice, newState,

                    mProfile.getProfileId());

        }

    }

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

+22 −22
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify addDevice().

     */

    @Test

    public void testAddDevice_validCachedDevices_devicesAdded() {

    public void addDevice_validCachedDevices_devicesAdded() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -136,7 +136,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify getName().

     */

    @Test

    public void testGetName_validCachedDevice_nameFound() {

    public void getName_validCachedDevice_nameFound() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(mCachedDeviceManager.getName(mDevice1)).isEqualTo(DEVICE_ALIAS_1);
@@ -146,7 +146,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onDeviceNameUpdated().

     */

    @Test

    public void testOnDeviceNameUpdated_validName_nameUpdated() {

    public void onDeviceNameUpdated_validName_nameUpdated() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(cachedDevice1.getName()).isEqualTo(DEVICE_ALIAS_1);
@@ -161,7 +161,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify clearNonBondedDevices().

     */

    @Test

    public void testClearNonBondedDevices_bondedAndNonBondedDevices_nonBondedDevicesCleared() {

    public void clearNonBondedDevices_bondedAndNonBondedDevices_nonBondedDevicesCleared() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -193,7 +193,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify clearNonBondedDevices() for hearing aids.

     */

    @Test

    public void testClearNonBondedDevices_HearingAids_nonBondedHAsClearedFromCachedDevicesMap() {

    public void clearNonBondedDevices_HearingAids_nonBondedHAsClearedFromCachedDevicesMap() {

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

        when(mDevice2.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
@@ -214,7 +214,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onHiSyncIdChanged() for hearing aid devices with same HiSyncId.

     */

    @Test

    public void testOnHiSyncIdChanged_sameHiSyncId_populateInDifferentLists() {

    public void onHiSyncIdChanged_sameHiSyncId_populateInDifferentLists() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -247,7 +247,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * device is connected and other is disconnected. The connected device should be chosen.

     */

    @Test

    public void testOnHiSyncIdChanged_sameHiSyncIdAndOneConnected_chooseConnectedDevice() {

    public void onHiSyncIdChanged_sameHiSyncIdAndOneConnected_chooseConnectedDevice() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -282,7 +282,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onHiSyncIdChanged() for hearing aid devices with different HiSyncId.

     */

    @Test

    public void testOnHiSyncIdChanged_differentHiSyncId_populateInSameList() {

    public void onHiSyncIdChanged_differentHiSyncId_populateInSameList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -316,7 +316,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onProfileConnectionStateChanged() for single hearing aid device connection.

     */

    @Test

    public void testOnProfileConnectionStateChanged_singleDeviceConnected_visible() {

    public void onProfileConnectionStateChanged_singleDeviceConnected_visible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        cachedDevice1.onProfileStateChanged(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
@@ -353,7 +353,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * devices are disconnected and they get connected.

     */

    @Test

    public void testOnProfileConnectionStateChanged_twoDevicesConnected_oneDeviceVisible() {

    public void onProfileConnectionStateChanged_twoDevicesConnected_oneDeviceVisible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -405,7 +405,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * devices are connected and they get disconnected.

     */

    @Test

    public void testOnProfileConnectionStateChanged_twoDevicesDisconnected_oneDeviceVisible() {

    public void onProfileConnectionStateChanged_twoDevicesDisconnected_oneDeviceVisible() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -458,7 +458,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify OnDeviceUnpaired() for a paired hearing Aid device pair.

     */

    @Test

    public void testOnDeviceUnpaired_bothHearingAidsPaired_removesItsPairFromList() {

    public void onDeviceUnpaired_bothHearingAidsPaired_removesItsPairFromList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -488,7 +488,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify OnDeviceUnpaired() for paired hearing Aid devices which are not a pair.

     */

    @Test

    public void testOnDeviceUnpaired_bothHearingAidsNotPaired_doesNotRemoveAnyDeviceFromList() {

    public void onDeviceUnpaired_bothHearingAidsNotPaired_doesNotRemoveAnyDeviceFromList() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -532,7 +532,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify addDevice() for hearing aid devices with same HiSyncId.

     */

    @Test

    public void testAddDevice_hearingAidDevicesWithSameHiSyncId_populateInDifferentLists() {

    public void addDevice_hearingAidDevicesWithSameHiSyncId_populateInDifferentLists() {

        doAnswer((invocation) -> mHearingAidProfile).when(mLocalProfileManager)

            .getHearingAidProfile();

        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice1);
@@ -560,7 +560,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify addDevice() for hearing aid devices with different HiSyncId.

     */

    @Test

    public void testAddDevice_hearingAidDevicesWithDifferentHiSyncId_populateInSameList() {

    public void addDevice_hearingAidDevicesWithDifferentHiSyncId_populateInSameList() {

        doAnswer((invocation) -> mHearingAidProfile).when(mLocalProfileManager)

            .getHearingAidProfile();

        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice1);
@@ -592,7 +592,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify getHearingAidPairDeviceSummary() for hearing aid devices with same HiSyncId.

     */

    @Test

    public void testGetHearingAidPairDeviceSummary_bothHearingAidsPaired_returnsSummaryOfPair() {

    public void getHearingAidPairDeviceSummary_bothHearingAidsPaired_returnsSummaryOfPair() {

        mCachedDevice1.setHiSyncId(HISYNCID1);

        mCachedDevice2.setHiSyncId(HISYNCID1);

        mCachedDeviceManager.mCachedDevices.add(mCachedDevice1);
@@ -609,7 +609,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * HiSyncId.

     */

    @Test

    public void testGetHearingAidPairDeviceSummary_bothHearingAidsNotPaired_returnsNull() {

    public void getHearingAidPairDeviceSummary_bothHearingAidsNotPaired_returnsNull() {

        mCachedDevice1.setHiSyncId(HISYNCID1);

        mCachedDevice2.setHiSyncId(HISYNCID2);

        mCachedDeviceManager.mCachedDevices.add(mCachedDevice1);
@@ -625,7 +625,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify updateHearingAidsDevices().

     */

    @Test

    public void testUpdateHearingAidDevices_hiSyncIdAvailable_setsHiSyncId() {

    public void updateHearingAidDevices_hiSyncIdAvailable_setsHiSyncId() {

        doAnswer((invocation) -> mHearingAidProfile).when(mLocalProfileManager)

            .getHearingAidProfile();

        doAnswer((invocation) -> HISYNCID1).when(mHearingAidProfile).getHiSyncId(mDevice1);
@@ -643,7 +643,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onBtClassChanged().

     */

    @Test

    public void testOnBtClassChanged_validBtClass_classChanged() {

    public void onBtClassChanged_validBtClass_classChanged() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        assertThat(cachedDevice1.getBtClass()).isEqualTo(DEVICE_CLASS_1);
@@ -658,7 +658,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onDeviceDisappeared().

     */

    @Test

    public void testOnDeviceDisappeared_deviceBondedUnbonded_unbondedDeviceDisappeared() {

    public void onDeviceDisappeared_deviceBondedUnbonded_unbondedDeviceDisappeared() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();
@@ -673,7 +673,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onActiveDeviceChanged().

     */

    @Test

    public void testOnActiveDeviceChanged_connectedDevices_activeDeviceChanged() {

    public void onActiveDeviceChanged_connectedDevices_activeDeviceChanged() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);
@@ -736,7 +736,7 @@ public class CachedBluetoothDeviceManagerTest { 
     * Test to verify onActiveDeviceChanged() with A2DP and Hearing Aid.

     */

    @Test

    public void testOnActiveDeviceChanged_withA2dpAndHearingAid() {

    public void onActiveDeviceChanged_withA2dpAndHearingAid() {

        CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);

        assertThat(cachedDevice1).isNotNull();

        CachedBluetoothDevice cachedDevice2 = mCachedDeviceManager.addDevice(mDevice2);

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

+103 −83

File changed.

Preview size limit exceeded, changes collapsed.