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

Commit b3921f41 authored by Chris Manton's avatar Chris Manton
Browse files

Use proper types tBTM_BLE_SEC_ACT 

Toward readable code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: Iad6f664ff123e5cee858ef4fee9a7356a89df9c9
parent 6be1feac

system/main/shim/l2c_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ class LeSecurityEnforcementShim 
  void Enforce(bluetooth::hci::AddressWithType remote,

               bluetooth::l2cap::le::SecurityPolicy policy,

               ResultCallback result_callback) override {

    tBTM_BLE_SEC_ACT sec_act = 0;

    tBTM_BLE_SEC_ACT sec_act = BTM_BLE_SEC_NONE;

    switch (policy) {

      case bluetooth::l2cap::le::SecurityPolicy::

          NO_SECURITY_WHATSOEVER_PLAINTEXT_TRANSPORT_OK:

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -3127,7 +3127,7 @@ void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status) { 
          // Encryption is required to start SM over BR/EDR

          // indicate that this is encryption after authentication

          BTM_SetEncryption(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR, NULL, NULL,

                            0);

                            BTM_BLE_SEC_NONE);

        }

      }

      l2cu_start_post_bond_timer(p_dev_rec->hci_handle);
@@ -4607,7 +4607,7 @@ static bool btm_sec_queue_mx_request(const RawAddress& bd_addr, uint16_t psm, 
  p_e->p_callback = p_callback;

  p_e->p_ref_data = p_ref_data;

  p_e->transport = BT_TRANSPORT_BR_EDR;

  p_e->sec_act = 0;

  p_e->sec_act = BTM_BLE_SEC_NONE;

  p_e->bd_addr = bd_addr;



  BTM_TRACE_EVENT(