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

Commit c1d5c4fa authored by Stanley Tng's avatar Stanley Tng
Browse files

Fix Connect State message in Device details for Hearing Aids 

In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the summary messages
for these two devices. Previously, the connect state of the summary
messages are inconsistent and does not always update. This CL will
always make sure that both side devices are refreshed at the same time
and also make sure that we get the summary messages of both sides.
Also added Robo tests for the changes.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116317072
Change-Id: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
parent a3608c91

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

+6 −2
Original line number Diff line number Diff line
@@ -110,6 +110,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        mHiSyncId = id;

    }



    public boolean isHearingAidDevice() {

        return mHiSyncId != BluetoothHearingAid.HI_SYNC_ID_INVALID;

    }



    /**

     * Last time a bt profile auto-connect was attempted.

     * If an ACTION_UUID intent comes in within
@@ -144,8 +148,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


    void onProfileStateChanged(LocalBluetoothProfile profile, int newProfileState) {

        if (Utils.D) {

            Log.d(TAG, "onProfileStateChanged: profile " + profile +

                    " newProfileState " + newProfileState);

            Log.d(TAG, "onProfileStateChanged: profile " + profile + ", device=" + mDevice

                    + ", newProfileState " + newProfileState);

        }

        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)

        {

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

+8 −8
Original line number Diff line number Diff line
@@ -162,14 +162,14 @@ public class CachedBluetoothDeviceManager { 
     */

    public synchronized String getHearingAidPairDeviceSummary(CachedBluetoothDevice device) {

        String pairDeviceSummary = null;

        if (device.getHiSyncId() != BluetoothHearingAid.HI_SYNC_ID_INVALID) {

            for (CachedBluetoothDevice hearingAidDevice : mHearingAidDevicesNotAddedInCache) {

                if (hearingAidDevice.getHiSyncId() != BluetoothHearingAid.HI_SYNC_ID_INVALID

                    && hearingAidDevice.getHiSyncId() == device.getHiSyncId()) {

                    pairDeviceSummary = hearingAidDevice.getConnectionSummary();

                }

            }

        CachedBluetoothDevice otherHearingAidDevice =

            getHearingAidOtherDevice(device, device.getHiSyncId());

        if (otherHearingAidDevice != null) {

            pairDeviceSummary = otherHearingAidDevice.getConnectionSummary();

        }

        log("getHearingAidPairDeviceSummary: pairDeviceSummary=" + pairDeviceSummary

            + ", otherHearingAidDevice=" + otherHearingAidDevice);

 

        return pairDeviceSummary;

    }
@@ -358,7 +358,7 @@ public class CachedBluetoothDeviceManager { 
        }

    }



    private CachedBluetoothDevice getHearingAidOtherDevice(CachedBluetoothDevice thisDevice,

    public CachedBluetoothDevice getHearingAidOtherDevice(CachedBluetoothDevice thisDevice,

                                                           long hiSyncId) {

        if (hiSyncId == BluetoothHearingAid.HI_SYNC_ID_INVALID) {

            return null;

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

+18 −5
Original line number Diff line number Diff line
@@ -378,9 +378,10 @@ public class LocalBluetoothProfileManager { 
                Log.i(TAG, "Failed to connect " + mProfile + " device");

            }



            if (getHearingAidProfile() != null &&

                mProfile instanceof HearingAidProfile &&

                (newState == BluetoothProfile.STATE_CONNECTED)) {

            boolean isHearingAidProfile = (getHearingAidProfile() != null) &&

                (mProfile instanceof HearingAidProfile);



            if (isHearingAidProfile && (newState == BluetoothProfile.STATE_CONNECTED)) {

                // Check if the HiSyncID has being initialized

                if (cachedDevice.getHiSyncId() == BluetoothHearingAid.HI_SYNC_ID_INVALID) {
@@ -393,10 +394,22 @@ public class LocalBluetoothProfileManager { 
                }

            }



            mEventManager.dispatchProfileConnectionStateChanged(cachedDevice, newState,

                    mProfile.getProfileId());

            cachedDevice.onProfileStateChanged(mProfile, newState);

            cachedDevice.refresh();



            if (isHearingAidProfile) {

                CachedBluetoothDevice otherDevice =

                    mDeviceManager.getHearingAidOtherDevice(cachedDevice, cachedDevice.getHiSyncId());

                if (otherDevice != null) {

                    if (DEBUG) {

                        Log.d(TAG, "Refreshing other hearing aid=" + otherDevice

                               + ", newState=" + newState);

                    }

                    otherDevice.refresh();

                }

            }

            mEventManager.dispatchProfileConnectionStateChanged(cachedDevice, newState,

                    mProfile.getProfileId());

        }

    }

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

+16 −0
Original line number Diff line number Diff line
@@ -828,4 +828,20 @@ public class CachedBluetoothDeviceManagerTest { 
        assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEADSET)).isFalse();

        assertThat(cachedDevice2.isActiveDevice(BluetoothProfile.HEARING_AID)).isFalse();

    }



    /**

     * Test to verify getHearingAidOtherDevice() for hearing aid devices with same HiSyncId.

     */

    @Test

    public void testGetHearingAidOtherDevice_bothHearingAidsPaired_returnsOtherDevice() {

        mCachedDevice1.setHiSyncId(HISYNCID1);

        mCachedDevice2.setHiSyncId(HISYNCID1);

        mCachedDeviceManager.mCachedDevices.add(mCachedDevice1);

        mCachedDeviceManager.mHearingAidDevicesNotAddedInCache.add(mCachedDevice2);

        doAnswer((invocation) -> DEVICE_SUMMARY_1).when(mCachedDevice1).getConnectionSummary();

        doAnswer((invocation) -> DEVICE_SUMMARY_2).when(mCachedDevice2).getConnectionSummary();



        assertThat(mCachedDeviceManager.getHearingAidOtherDevice(mCachedDevice1, HISYNCID1))

            .isEqualTo(mCachedDevice2);

    }

}

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

+13 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.robolectric.Shadows.shadowOf; 


import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothProfile;

import android.content.Context;

import android.media.AudioManager;
@@ -572,4 +573,16 @@ public class CachedBluetoothDeviceTest { 


        assertThat(mCachedDevice.isHfpDevice()).isFalse();

    }



    @Test

    public void testIsHearingAidDevice_isHearingAidDevice() {

        mCachedDevice.setHiSyncId(0x1234);

        assertThat(mCachedDevice.isHearingAidDevice()).isTrue();

    }



    @Test

    public void testIsHearingAidDevice_isNotHearingAidDevice() {

        mCachedDevice.setHiSyncId(BluetoothHearingAid.HI_SYNC_ID_INVALID);

        assertThat(mCachedDevice.isHearingAidDevice()).isFalse();

    }

}