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

Commit ab5e174e authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Remove descriptors of unbonded device" am: ff9608e1 

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



Change-Id: Ib10ba50c268fdbdef0bc9ccf28fdc66b5a697479
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f082820e ff9608e1

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

+8 −2
Original line number Diff line number Diff line
@@ -1945,7 +1945,6 @@ public class LeAudioService extends ProfileService { 
                return;

            }

            removeStateMachine(device);

            mDeviceDescriptors.remove(device);

        }

    }
@@ -1967,6 +1966,8 @@ public class LeAudioService extends ProfileService { 
            sm.doQuit();

            sm.cleanup();

            descriptor.mStateMachine = null;



            mDeviceDescriptors.remove(device);

        }

    }
@@ -3462,7 +3463,12 @@ public class LeAudioService extends ProfileService { 
                        continue;

                    }



                    if (deviceDescriptor.mStateMachine != null) {

                        deviceDescriptor.mStateMachine.dump(sb);

                    } else {

                        ProfileService.println(sb, "state machine is null");

                    }



                    ProfileService.println(sb, "    mDevInbandRingtoneEnabled: "

                            + deviceDescriptor.mDevInbandRingtoneEnabled);

                    ProfileService.println(sb, "    mSinkAudioLocation: "