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

Commit 44f78637 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

HF Client: Flatten sec mask am: 51c61688 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1409088

Change-Id: I0e820d801ccee452e154ffdd76a4a341513de3bb
parents 7d15a26c 51c61688

system/bta/hf_client/bta_hf_client_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ 
 * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.

 *

 ******************************************************************************/

tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK* p_cback, tBTA_SEC sec_mask,

tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK* p_cback,

                               tBTA_HF_CLIENT_FEAT features,

                               const char* p_service_name) {

  return bta_hf_client_api_enable(p_cback, sec_mask, features, p_service_name);

  return bta_hf_client_api_enable(p_cback, features, p_service_name);

}



/*******************************************************************************

system/bta/hf_client/bta_hf_client_int.h

+0 −2
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ typedef struct { 
  uint8_t scn;

  tBTA_HF_CLIENT_CBACK* p_cback; /* application callback */

  tBTA_HF_CLIENT_FEAT features;  /* features registered by application */

  tBTA_SEC serv_sec_mask;        /* server security mask */

  uint16_t serv_handle;          /* RFCOMM server handle */

  bool deregister;               /* true if service shutting down */
@@ -223,7 +222,6 @@ extern void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, 
                                          const RawAddress& peer_addr);

extern void bta_hf_client_resume_open(tBTA_HF_CLIENT_CB* client_cb);

extern tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback,

                                            tBTA_SEC sec_mask,

                                            tBTA_HF_CLIENT_FEAT features,

                                            const char* p_service_name);

system/bta/hf_client/bta_hf_client_main.cc

+0 −2
Original line number Diff line number Diff line
@@ -408,7 +408,6 @@ void bta_hf_client_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, 
 *

 ******************************************************************************/

tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback,

                                     tBTA_SEC sec_mask,

                                     tBTA_HF_CLIENT_FEAT features,

                                     const char* p_service_name) {

  /* If already registered then return error */
@@ -424,7 +423,6 @@ tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback, 
  bta_hf_client_cb_arr_init();



  bta_hf_client_cb_arr.p_cback = p_cback;

  bta_hf_client_cb_arr.serv_sec_mask = sec_mask;

  bta_hf_client_cb_arr.features = features;



  /* create SDP records */

system/bta/hf_client/bta_hf_client_rfc.cc

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void bta_hf_client_start_server() { 
      UUID_SERVCLASS_HF_HANDSFREE, bta_hf_client_cb_arr.scn, true,

      BTA_HF_CLIENT_MTU, RawAddress::kAny, &(bta_hf_client_cb_arr.serv_handle),

      bta_hf_client_mgmt_cback, BTM_SEC_SERVICE_HF_HANDSFREE,

      bta_hf_client_cb_arr.serv_sec_mask);

      BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT);



  APPL_TRACE_DEBUG("%s: started rfcomm server with handle %d", __func__,

                   bta_hf_client_cb_arr.serv_handle);

system/bta/include/bta_hf_client_api.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ typedef void(tBTA_HF_CLIENT_CBACK)(tBTA_HF_CLIENT_EVT event, 
 * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.

 *

 ******************************************************************************/

tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK* p_cback, tBTA_SEC sec_mask,

tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK* p_cback,

                               tBTA_HF_CLIENT_FEAT features,

                               const char* p_service_name);