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

Commit 28696710 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix getting first device." am: 0d7a2baf am: 1c40bd64 

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



Change-Id: I7f42f976f686963f38dc5e40fbad4ba602efcf79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0b00652 1c40bd64

system/bta/le_audio/devices.cc

+5 −3
Original line number Diff line number Diff line
@@ -116,10 +116,12 @@ void LeAudioDeviceGroup::Activate(void) { 
}



LeAudioDevice* LeAudioDeviceGroup::GetFirstDevice(void) {

  auto d = leAudioDevices_.front();

  if (d.expired()) return nullptr;

  auto iter = std::find_if(leAudioDevices_.begin(), leAudioDevices_.end(),

                           [](auto& iter) { return !iter.expired(); });



  if (iter == leAudioDevices_.end()) return nullptr;



  return (d.lock()).get();

  return (iter->lock()).get();

}



LeAudioDevice* LeAudioDeviceGroup::GetFirstDeviceWithActiveContext(