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

Commit 76f524b0 authored by Xiao Ma's avatar Xiao Ma
Browse files

Revert "leaudio: Fix removing group descriptors" 

This reverts commit d430d357.

Reason for revert: This cl didn't pass TH before merging, which brings the build failure and blocking other fixes, see b/202679185 for details. Try to revert this change first.

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: atest BluetoothInstrumentationTests

Change-Id: I4067a20f4892993184cfa56c4771c333db1bed48
parent d430d357

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

+4 −7
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ public class LeAudioService extends ProfileService { 
            }

        }



        mGroupDescriptors.remove(groupId);



        return true;

    }
@@ -650,16 +652,11 @@ public class LeAudioService extends ProfileService { 
            switch (node_status) {

                case LeAudioStackEvent.GROUP_NODE_ADDED:

                    mDeviceGroupIdMap.put(device, group_id);

                    LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);

                    if (descriptor == null) {

                    mGroupDescriptors.put(group_id, new LeAudioGroupDescriptor());

                    }

                    break;

                case LeAudioStackEvent.GROUP_NODE_REMOVED:

                    mDeviceGroupIdMap.remove(device);

                    if (mDeviceGroupIdMap.containsKey(group_id) == false) {

                    mGroupDescriptors.remove(group_id);

                    }

                    break;

                default:

                    break;