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

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

Update hearing aid device summary message 

Previously, if battery info is available, we won't show hearing aid
device side info in the summary message. Remove this condition to make
the behavior align the figma and keep the same accross different pages.

Bug: 325527129
Test: manually check the UI result
Change-Id: Ieec9f81968002ab62cb99b6f7846776efec872fd
parent c7d04194

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

+1 −2
Original line number Diff line number Diff line
@@ -1313,8 +1313,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
                boolean isActiveAshaHearingAid = mIsActiveDeviceHearingAid;

                boolean isActiveLeAudioHearingAid = mIsActiveDeviceLeAudio

                        && isConnectedHapClientDevice();

                if ((isActiveAshaHearingAid || isActiveLeAudioHearingAid)

                        && stringRes == R.string.bluetooth_active_no_battery_level) {

                if (isActiveAshaHearingAid || isActiveLeAudioHearingAid) {

                    final Set<CachedBluetoothDevice> memberDevices = getMemberDevice();

                    final CachedBluetoothDevice subDevice = getSubDevice();

                    if (memberDevices.stream().anyMatch(m -> m.isConnected())) {