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

Commit 33c06469 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "stack::sdp [10/12] handle.SDP_AddProfileDescriptorList" into main am:... 

Merge "stack::sdp [10/12] handle.SDP_AddProfileDescriptorList" into main am: 6fd7feae am: b67c9c0a

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



Change-Id: I93845b34262c5a8193373de7935696e91cdd0dd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c3e20f3 b67c9c0a

system/bta/ar/bta_ar.cc

+5 −2
Original line number Diff line number Diff line
@@ -348,8 +348,11 @@ void bta_ar_reg_avrc_for_src_sink_coexist( 
        } else {

          bta_ar_cb.ct_ver = profile_version;

        }

        get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(

            bta_ar_cb.sdp_ct_handle, service_uuid, profile_version);

        if (!get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(

                bta_ar_cb.sdp_ct_handle, service_uuid, profile_version)) {

          log::warn("Unable to add SDP profile descriptor version handle:{}",

                    bta_ar_cb.sdp_ct_handle);

        }

      }

      /* multiple CT are allowed.

       * Change supported categories on the second one */

system/stack/pan/pan_utils.cc

+4 −2
Original line number Diff line number Diff line
@@ -96,8 +96,10 @@ uint32_t pan_register_with_sdp(uint16_t uuid, const char* p_name, 
      LANGUAGE_BASE_ID);



  /* Profile descriptor list */

  get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(

      sdp_handle, uuid, PAN_PROFILE_VERSION);

  if (!get_legacy_stack_sdp_api()->handle.SDP_AddProfileDescriptorList(

          sdp_handle, uuid, PAN_PROFILE_VERSION)) {

    log::warn("Unable to add SDP PAN profile version");

  }



  /* Service Name */

  get_legacy_stack_sdp_api()->handle.SDP_AddAttribute(