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

Commit f07d9271 authored by Sandeep Samdaria's avatar Sandeep Samdaria Committed by Automerger Merge Worker
Browse files

Merge "Store the reference prior to erasing the reference." into main am: 9ad78551 am: ac17031b 

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



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

system/profile/avrcp/avrcp_sdp_records.cc

+4 −4
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ uint16_t AvrcSdpRecordHelper::RemoveRecord(const uint16_t request_id) { 
    return AVRC_FAIL;

  }

  const auto& sdp_record_request_pair = sdp_record_request_map_.find(request_id);

  const auto service_uuid = sdp_record_request_pair->second.service_uuid;

  sdp_record_request_map_.erase(request_id);

  AvrcpSdpRecord merged_sdp_records;

  MergeSdpRecords(merged_sdp_records);

  const uint16_t categories = merged_sdp_records.categories;

  const auto& deleted_sdp_record = sdp_record_request_pair->second;

  log::info("Categories after removing the request_id {} : 0x{:x} for service uuid 0x{:x}",

            request_id, categories, deleted_sdp_record.service_uuid);

            request_id, categories, service_uuid);

  if (sdp_record_handle_ != RECORD_NOT_ASSIGNED) {

    if (categories) {

      uint8_t temp[sizeof(uint16_t)], *p;
@@ -95,8 +95,8 @@ uint16_t AvrcSdpRecordHelper::RemoveRecord(const uint16_t request_id) { 
                     ? AVRC_SUCCESS

                     : AVRC_FAIL;

    } else {

      log::info("Removing the record for service uuid 0x{:x}", deleted_sdp_record.service_uuid);

      bta_sys_remove_uuid(deleted_sdp_record.service_uuid);

      log::info("Removing the record for service uuid 0x{:x}", service_uuid);

      bta_sys_remove_uuid(service_uuid);

      sdp_record_handle_ = RECORD_NOT_ASSIGNED;

      return AVRC_RemoveRecord(sdp_record_handle_);

    }