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

Commit a454969a authored by Martin Yan's avatar Martin Yan Committed by Automerger Merge Worker
Browse files

Merge "Not add RAS to SDP record currently." into main am: 11d6464f am: ef962dea 

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



Change-Id: Id61ce077fd0f2451021eb08cd564d9a90c4bc242
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62ce2961 ef962dea

system/stack/gatt/gatt_api.cc

+6 −1
Original line number Diff line number Diff line
@@ -320,7 +320,12 @@ tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service, in 
    Uuid* p_uuid = gatts_get_service_uuid(elem.p_db);

    if (*p_uuid != Uuid::From16Bit(UUID_SERVCLASS_GMCS_SERVER) &&

        *p_uuid != Uuid::From16Bit(UUID_SERVCLASS_GTBS_SERVER)) {

      if (com::android::bluetooth::flags::channel_sounding_in_stack() &&

          *p_uuid == Uuid::From16Bit(UUID_SERVCLASS_RAS)) {

        elem.sdp_handle = 0;

      } else {

        elem.sdp_handle = gatt_add_sdp_record(*p_uuid, elem.s_hdl, elem.e_hdl);

      }

    } else {

      elem.sdp_handle = 0;

    }

system/stack/include/bt_uuid16.h

+1 −0
Original line number Diff line number Diff line
@@ -126,3 +126,4 @@ 
  0x184c                                  /* Generic Telephony Bearer \

                                             Service*/

#define UUID_SERVCLASS_TMAS_SERVER 0x1855 /* Telephone and Media Audio Service */

#define UUID_SERVCLASS_RAS 0x7F7D         /* Ranging Service */