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

Commit 67a5c38c authored by Kyunglyul Hyun's avatar Kyunglyul Hyun
Browse files

Remove descriptors of unbonded device 

When ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED
is sent before ACTION_BOND_STATE_CHANGED is sent,
the state machine is removed but the device descriptor
is not removed from the hash map.

Which could cause NPE in dumpsys.

We could repro this by forgetting LE audio device
multiple times.

This CL ensures the device descriptor is removed when
the state machine is removed.

Tag: #feature
Bug: 269969529
Test: manually forgetting LE devices and see dumpsys
and atest BluetoothInstrumentationTests

Change-Id: I0f9afe8ebb1712dd03b4072fe6f42a37919bb3c1
parent 9734994a

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: "