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

Commit fb42fd1d authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

AVRCP: Advance iterator before deleting it am: 4b55f4d3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1453980

Change-Id: I9418060d15bad8a2fb9b78e6581713d67ea0348b
parents bef4a65b 4b55f4d3
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -85,9 +85,12 @@ bool ConnectionHandler::CleanUp() {
  CHECK(instance_ != nullptr);

  // TODO (apanicke): Cleanup the SDP Entries here
  for (const auto& entry : instance_->device_map_) {
    entry.second->DeviceDisconnected();
    instance_->avrc_->Close(entry.first);
  for (auto entry = instance_->device_map_.begin();
       entry != instance_->device_map_.end();) {
    auto curr = entry;
    entry++;
    curr->second->DeviceDisconnected();
    instance_->avrc_->Close(curr->first);
  }
  instance_->device_map_.clear();
  instance_->feature_map_.clear();