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

Commit 1c946444 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix BoxedPrimitiveEquality errorprone issue" into main am: c0683223 am: fbb5d414 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3006408



Change-Id: I555c7cf276577e1650eb409b58b7c0f956eed97f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 895ffc52 fbb5d414

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+4 −3
Original line number Diff line number Diff line
@@ -2480,8 +2480,9 @@ public class LeAudioService extends ProfileService { 
                    Log.i(TAG, "updateInbandRingtoneForTheGroup, setting inband ringtone to: "

                                + groupDescriptor.mInbandRingtoneEnabled + " for " + device

                                + " " + deviceDescriptor.mDevInbandRingtoneEnabled);

                    if (groupDescriptor.mInbandRingtoneEnabled

                                    == deviceDescriptor.mDevInbandRingtoneEnabled) {

                    if (Objects.equals(

                            groupDescriptor.mInbandRingtoneEnabled,

                            deviceDescriptor.mDevInbandRingtoneEnabled)) {

                        if (DBG) {

                            Log.d(TAG, "Device " + device + " has already set inband ringtone to "

                                            + groupDescriptor.mInbandRingtoneEnabled);
@@ -5054,7 +5055,7 @@ public class LeAudioService extends ProfileService { 
                for (Map.Entry<BluetoothDevice, LeAudioDeviceDescriptor> deviceEntry

                        : mDeviceDescriptors.entrySet()) {

                    LeAudioDeviceDescriptor deviceDescriptor = deviceEntry.getValue();

                    if (deviceDescriptor.mGroupId != groupId) {

                    if (!Objects.equals(deviceDescriptor.mGroupId, groupId)) {

                        if (deviceDescriptor.mGroupId == LE_AUDIO_GROUP_ID_INVALID) {

                            numberOfUngroupedDevs++;

                        }