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

Commit 6434f6ad authored by Zach Johnson's avatar Zach Johnson
Browse files

Fold HID_DevSetSecurityLevel into device registration 

brings it a little closer to the l2cap calls

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I27168e1fc625009d62384708ff5c72d73d81c4ce
parent 045be3d9

system/bta/hd/bta_hd_act.cc

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ void bta_hd_api_enable(tBTA_HD_DATA* p_data) { 


  memset(&bta_hd_cb, 0, sizeof(tBTA_HD_CB));



  HID_DevSetSecurityLevel();



  /* store parameters */

  bta_hd_cb.p_cback = p_data->api_enable.p_cback;

system/stack/hid/hidd_api.cc

+13 −19
Original line number Diff line number Diff line
@@ -91,6 +91,19 @@ tHID_STATUS HID_DevRegister(tHID_DEV_HOST_CALLBACK* host_cback) { 


  if (host_cback == NULL) return HID_ERR_INVALID_PARAM;



  if (!BTM_SimpleSetSecurityLevel(BTM_SEC_SERVICE_HIDD_SEC_CTRL,

                                  BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT,

                                  HID_PSM_CONTROL)) {

    HIDD_TRACE_ERROR("Security Registration 1 failed");

    return (HID_ERR_NO_RESOURCES);

  }



  if (!BTM_SimpleSetSecurityLevel(BTM_SEC_SERVICE_HIDD_INTR, BTM_SEC_NONE,

                                  HID_PSM_INTERRUPT)) {

    HIDD_TRACE_ERROR("Security Registration 5 failed");

    return (HID_ERR_NO_RESOURCES);

  }



  /* Register with L2CAP */

  st = hidd_conn_reg();

  if (st != HID_SUCCESS) return st;
@@ -127,25 +140,6 @@ tHID_STATUS HID_DevDeregister(void) { 
  return (HID_SUCCESS);

}



tHID_STATUS HID_DevSetSecurityLevel() {

  HIDD_TRACE_API("%s", __func__);



  if (!BTM_SimpleSetSecurityLevel(BTM_SEC_SERVICE_HIDD_SEC_CTRL,

                                  BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT,

                                  HID_PSM_CONTROL)) {

    HIDD_TRACE_ERROR("Security Registration 1 failed");

    return (HID_ERR_NO_RESOURCES);

  }



  if (!BTM_SimpleSetSecurityLevel(BTM_SEC_SERVICE_HIDD_INTR, BTM_SEC_NONE,

                                  HID_PSM_INTERRUPT)) {

    HIDD_TRACE_ERROR("Security Registration 5 failed");

    return (HID_ERR_NO_RESOURCES);

  }



  return (HID_SUCCESS);

}



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

 *

 * Function         HID_DevAddRecord

system/stack/include/hidd_api.h

+0 −11
Original line number Diff line number Diff line
@@ -90,17 +90,6 @@ extern tHID_STATUS HID_DevRegister(tHID_DEV_HOST_CALLBACK* host_cback); 
 ******************************************************************************/

extern tHID_STATUS HID_DevDeregister(void);



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

 *

 * Function         HID_DevSetSecurityLevel

 *

 * Description      Sets security level for HID device connections

 *

 * Returns          tHID_STATUS

 *

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

extern tHID_STATUS HID_DevSetSecurityLevel();



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

 *

 * Function         HID_DevAddRecord