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

Commit d2b3c34f authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge "Update hearing aid device summary message" into main

parents 54b0dec7 d4d9ceb4

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

+1 −2
Original line number Diff line number Diff line
@@ -1315,8 +1315,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())) {