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

Commit f2bf7de7 authored by Henri Chataing's avatar Henri Chataing
Browse files

bt_trace: Convert conflicting bt_trace log instances to LOG_xx 

Resolve merge conflicts in preparation to full migration.

Bug: 305066880
Test: m com.android.btservices
Merged-In: I82ca961e2f5bea73f00e37cbad401666253dfee9
Change-Id: I12b54531bda305b5771eadde99b0554daf1d80e7
parent 3d137b20

system/bta/sdp/bta_sdp_act.cc

+6 −6
Original line number Diff line number Diff line
@@ -332,42 +332,42 @@ static void bta_create_dip_sdp_record(bluetooth_sdp_record* record, 
  if (p_attr != nullptr)

    record->dip.spec_id = p_attr->attr_value.v.u16;

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_SPECIFICATION_ID not found", __func__);

    LOG_ERROR("%s() ATTR_ID_SPECIFICATION_ID not found", __func__);



  p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

      p_rec, ATTR_ID_VENDOR_ID);

  if (p_attr != nullptr)

    record->dip.vendor = p_attr->attr_value.v.u16;

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_VENDOR_ID not found", __func__);

    LOG_ERROR("%s() ATTR_ID_VENDOR_ID not found", __func__);



  p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

      p_rec, ATTR_ID_VENDOR_ID_SOURCE);

  if (p_attr != nullptr)

    record->dip.vendor_id_source = p_attr->attr_value.v.u16;

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_VENDOR_ID_SOURCE not found", __func__);

    LOG_ERROR("%s() ATTR_ID_VENDOR_ID_SOURCE not found", __func__);



  p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

      p_rec, ATTR_ID_PRODUCT_ID);

  if (p_attr != nullptr)

    record->dip.product = p_attr->attr_value.v.u16;

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_PRODUCT_ID not found", __func__);

    LOG_ERROR("%s() ATTR_ID_PRODUCT_ID not found", __func__);



  p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

      p_rec, ATTR_ID_PRODUCT_VERSION);

  if (p_attr != nullptr)

    record->dip.version = p_attr->attr_value.v.u16;

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_PRODUCT_VERSION not found", __func__);

    LOG_ERROR("%s() ATTR_ID_PRODUCT_VERSION not found", __func__);



  p_attr = get_legacy_stack_sdp_api()->record.SDP_FindAttributeInRec(

      p_rec, ATTR_ID_PRIMARY_RECORD);

  if (p_attr != nullptr)

    record->dip.primary_record = !(!p_attr->attr_value.v.u8);

  else

    APPL_TRACE_ERROR("%s() ATTR_ID_PRIMARY_RECORD not found", __func__);

    LOG_ERROR("%s() ATTR_ID_PRIMARY_RECORD not found", __func__);

}



static void bta_create_raw_sdp_record(bluetooth_sdp_record* record,