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

Commit a876077d authored by Angela Wang's avatar Angela Wang
Browse files

Fix LEA hearing aid not shown in hearing device page after reboot issue 

Only ASHA hearing aids' info is updated after reboot. This causes the LE
audio hearing aids are not correctly shown when entering a11y hearing
devices page due to the lack of hearing aid info.

We should call `CachedBluetoothDeviceManager.updateHearingAidsDevices()`
when hearing aid related services are connected, which includes
HearingAidProfile, LeAudioProfile and HapClientProfile.

Bug: 283369017
Test: atest HearingAidDeviceManagerTest
Change-Id: I2a7a194194ade9fc1b77bd837190153dddb973b1
parent 01642009

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

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ public class HapClientProfile implements LocalBluetoothProfile { 
                device.refresh();

            }



            // Check current list of CachedDevices to see if any are hearing aid devices.

            mDeviceManager.updateHearingAidsDevices();

            mIsProfileReady = true;

            mProfileManager.callServiceConnectedListeners();

        }

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

+61 −54
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */

package com.android.settingslib.bluetooth;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothUuid;

import android.bluetooth.le.ScanFilter;
@@ -68,14 +68,9 @@ public class HearingAidDeviceManager { 


    void initHearingAidDeviceIfNeeded(CachedBluetoothDevice newDevice,

            List<ScanFilter> leScanFilters) {

        long hiSyncId = getHiSyncId(newDevice.getDevice());

        if (isValidHiSyncId(hiSyncId)) {

            // Once hiSyncId is valid, assign hearing aid info

            final HearingAidInfo.Builder infoBuilder = new HearingAidInfo.Builder()

                    .setAshaDeviceSide(getDeviceSide(newDevice.getDevice()))

                    .setAshaDeviceMode(getDeviceMode(newDevice.getDevice()))

                    .setHiSyncId(hiSyncId);

            newDevice.setHearingAidInfo(infoBuilder.build());

        HearingAidInfo info = generateHearingAidInfo(newDevice);

        if (info != null) {

            newDevice.setHearingAidInfo(info);

        } else if (leScanFilters != null && !newDevice.isHearingAidDevice()) {

            // If the device is added with hearing aid scan filter during pairing, set an empty

            // hearing aid info to indicate it's a hearing aid device. The info will be updated
@@ -94,38 +89,6 @@ public class HearingAidDeviceManager { 
        }

    }



    private long getHiSyncId(BluetoothDevice device) {

        final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();

        final HearingAidProfile profileProxy = profileManager.getHearingAidProfile();

        if (profileProxy == null) {

            return BluetoothHearingAid.HI_SYNC_ID_INVALID;

        }



        return profileProxy.getHiSyncId(device);

    }



    private int getDeviceSide(BluetoothDevice device) {

        final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();

        final HearingAidProfile profileProxy = profileManager.getHearingAidProfile();

        if (profileProxy == null) {

            Log.w(TAG, "HearingAidProfile is not supported and not ready to fetch device side");

            return HearingAidProfile.DeviceSide.SIDE_INVALID;

        }



        return profileProxy.getDeviceSide(device);

    }



    private int getDeviceMode(BluetoothDevice device) {

        final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();

        final HearingAidProfile profileProxy = profileManager.getHearingAidProfile();

        if (profileProxy == null) {

            Log.w(TAG, "HearingAidProfile is not supported and not ready to fetch device mode");

            return HearingAidProfile.DeviceMode.MODE_INVALID;

        }



        return profileProxy.getDeviceMode(device);

    }



    boolean setSubDeviceIfNeeded(CachedBluetoothDevice newDevice) {

        final long hiSyncId = newDevice.getHiSyncId();

        if (isValidHiSyncId(hiSyncId)) {
@@ -157,21 +120,17 @@ public class HearingAidDeviceManager { 


    // To collect all HearingAid devices and call #onHiSyncIdChanged to group device by HiSyncId

    void updateHearingAidsDevices() {

        final Set<Long> newSyncIdSet = new HashSet<Long>();

        final Set<Long> newSyncIdSet = new HashSet<>();

        for (CachedBluetoothDevice cachedDevice : mCachedDevices) {

            // Do nothing if HiSyncId has been assigned

            if (!isValidHiSyncId(cachedDevice.getHiSyncId())) {

                final long newHiSyncId = getHiSyncId(cachedDevice.getDevice());

                // Do nothing if there is no HiSyncId on Bluetooth device

                if (isValidHiSyncId(newHiSyncId)) {

                    // Once hiSyncId is valid, assign hearing aid info

                    final HearingAidInfo.Builder infoBuilder = new HearingAidInfo.Builder()

                            .setAshaDeviceSide(getDeviceSide(cachedDevice.getDevice()))

                            .setAshaDeviceMode(getDeviceMode(cachedDevice.getDevice()))

                            .setHiSyncId(newHiSyncId);

                    cachedDevice.setHearingAidInfo(infoBuilder.build());



                    newSyncIdSet.add(newHiSyncId);

            if (isValidHiSyncId(cachedDevice.getHiSyncId())) {

                continue;

            }

            HearingAidInfo info = generateHearingAidInfo(cachedDevice);

            if (info != null) {

                cachedDevice.setHearingAidInfo(info);

                if (isValidHiSyncId(info.getHiSyncId())) {

                    newSyncIdSet.add(info.getHiSyncId());

                }

            }

        }
@@ -378,6 +337,54 @@ public class HearingAidDeviceManager { 
        return null;

    }



    private boolean isLeAudioHearingAid(CachedBluetoothDevice cachedDevice) {

        List<LocalBluetoothProfile> profiles = cachedDevice.getProfiles();

        boolean supportLeAudio = profiles.stream().anyMatch(p -> p instanceof LeAudioProfile);

        boolean supportHapClient = profiles.stream().anyMatch(p -> p instanceof HapClientProfile);

        return supportLeAudio && supportHapClient;

    }



    private boolean isAshaHearingAid(CachedBluetoothDevice cachedDevice) {

        return cachedDevice.getProfiles().stream().anyMatch(p -> p instanceof HearingAidProfile);

    }



    private HearingAidInfo generateHearingAidInfo(CachedBluetoothDevice cachedDevice) {

        final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();

        if (isAshaHearingAid(cachedDevice)) {

            final HearingAidProfile asha = profileManager.getHearingAidProfile();

            if (asha == null) {

                Log.w(TAG, "HearingAidProfile is not supported on this device");

            } else {

                long hiSyncId = asha.getHiSyncId(cachedDevice.getDevice());

                if (isValidHiSyncId(hiSyncId)) {

                    final HearingAidInfo.Builder infoBuilder = new HearingAidInfo.Builder()

                            .setAshaDeviceSide(asha.getDeviceSide(cachedDevice.getDevice()))

                            .setAshaDeviceMode(asha.getDeviceMode(cachedDevice.getDevice()))

                            .setHiSyncId(hiSyncId);

                    return infoBuilder.build();

                }

            }

        }

        if (isLeAudioHearingAid(cachedDevice)) {

            final HapClientProfile hapClientProfile = profileManager.getHapClientProfile();

            final LeAudioProfile leAudioProfile = profileManager.getLeAudioProfile();

            if (hapClientProfile == null || leAudioProfile == null) {

                Log.w(TAG, "HapClientProfile or LeAudioProfile is not supported on this device");

            } else {

                int audioLocation = leAudioProfile.getAudioLocation(cachedDevice.getDevice());

                int hearingAidType = hapClientProfile.getHearingAidType(cachedDevice.getDevice());

                if (audioLocation != BluetoothLeAudio.AUDIO_LOCATION_INVALID

                        && hearingAidType != HapClientProfile.HearingAidType.TYPE_INVALID) {

                    final HearingAidInfo.Builder infoBuilder = new HearingAidInfo.Builder()

                            .setLeAudioLocation(audioLocation)

                            .setHapDeviceType(hearingAidType);

                    return infoBuilder.build();

                }

            }

        }

        return null;

    }



    private void log(String msg) {

        if (DEBUG) {

            Log.d(TAG, msg);

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class HearingAidProfile implements LocalBluetoothProfile { 
                device.refresh();

            }



            // Check current list of CachedDevices to see if any are Hearing Aid devices.

            // Check current list of CachedDevices to see if any are hearing aid devices.

            mDeviceManager.updateHearingAidsDevices();

            mIsProfileReady = true;

            mProfileManager.callServiceConnectedListeners();

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

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ public class LeAudioProfile implements LocalBluetoothProfile { 
                device.refresh();

            }



            // Check current list of CachedDevices to see if any are hearing aid devices.

            mDeviceManager.updateHearingAidsDevices();

            mProfileManager.callServiceConnectedListeners();

            mIsProfileReady = true;

        }

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

+218 −55

File changed.

Preview size limit exceeded, changes collapsed.