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

Commit b8147e3d authored by Myles Watson's avatar Myles Watson Committed by Andre Eisenbach
Browse files

GAP: Set service_id before calling gap_release_ccb 

Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.

From the documentation for BTM_SecClrService:

  Service ID - Id of the service to remove. '0' removes all
               service records (except SDP).

Bug: 65695769, 65223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit f90bebf2)
(cherry picked from commit 0ccc82c0)
parent 46e352b6

system/stack/gap/gap_conn.cc

+3 −1
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, 
  /* update the transport */

  p_ccb->transport = transport;



  /* The service_id must be set before calling gap_release_ccb(). */

  p_ccb->service_id = service_id;



  /* If caller specified a BD address, save it */

  if (p_rem_bda) {

    /* the bd addr is not BT_BD_ANY, then a bd address was specified */
@@ -211,7 +214,6 @@ uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id, 
  }



  /* Register with Security Manager for the specific security level */

  p_ccb->service_id = service_id;

  if (!BTM_SetSecurityLevel((uint8_t)!is_server, p_serv_name, p_ccb->service_id,

                            security, p_ccb->psm, 0, 0)) {

    GAP_TRACE_ERROR("GAP_CONN - Security Error");