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

Commit 393daa33 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12425444] into rvc-release 

Change-Id: I82b32d5c6528e4bf2c793eb6c064c3be4189c402
parents 90036a7c 190acb20

system/bta/dm/bta_dm_act.cc

+0 −10
Original line number Diff line number Diff line
@@ -3804,16 +3804,6 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 


      break;



    case BTM_LE_CONSENT_REQ_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = BTM_SecReadDevName(bda);

      if (p_name != NULL)

        strlcpy((char*)sec_event.ble_req.bd_name, p_name, BD_NAME_LEN);

      else

        sec_event.ble_req.bd_name[0] = 0;

      bta_dm_cb.p_sec_cback(BTA_DM_BLE_CONSENT_REQ_EVT, &sec_event);

      break;



    case BTM_LE_SEC_REQUEST_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = BTM_SecReadDevName(bda);

system/bta/include/bta_api.h

+0 −1
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ typedef uint8_t tBTA_SIG_STRENGTH_MASK; 
                                    */

#define BTA_DM_ENER_INFO_READ 28 /* Energy info read */

#define BTA_DM_BLE_SC_OOB_REQ_EVT 29 /* SMP SC OOB request event */

#define BTA_DM_BLE_CONSENT_REQ_EVT 30 /* SMP consent request event */

typedef uint8_t tBTA_DM_SEC_EVT;



/* Structure associated with BTA_DM_ENABLE_EVT */

system/btif/include/btif_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void btif_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, 
                                tBTA_BLE_LOCAL_ID_KEYS* p_id_keys);

void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr);

void btif_dm_remove_ble_bonding_keys(void);

void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req, bool is_consent);

void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req);



void btif_dm_update_ble_remote_properties(const RawAddress& bd_addr,

                                          BD_NAME bd_name,

system/btif/src/btif_dm.cc

+3 −7
Original line number Diff line number Diff line
@@ -1816,13 +1816,9 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
          break;

      }

      break;

    case BTA_DM_BLE_CONSENT_REQ_EVT:

      BTIF_TRACE_DEBUG("BTA_DM_BLE_CONSENT_REQ_EVT. ");

      btif_dm_ble_sec_req_evt(&p_data->ble_req, true);

      break;

    case BTA_DM_BLE_SEC_REQ_EVT:

      BTIF_TRACE_DEBUG("BTA_DM_BLE_SEC_REQ_EVT. ");

      btif_dm_ble_sec_req_evt(&p_data->ble_req, false);

      btif_dm_ble_sec_req_evt(&p_data->ble_req);

      break;

    case BTA_DM_BLE_PASSKEY_NOTIF_EVT:

      BTIF_TRACE_DEBUG("BTA_DM_BLE_PASSKEY_NOTIF_EVT. ");
@@ -3032,14 +3028,14 @@ void btif_dm_remove_ble_bonding_keys(void) { 
 * Returns          void

 *

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

void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req, bool is_consent) {

void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req) {

  bt_bdname_t bd_name;

  uint32_t cod;

  int dev_type;



  BTIF_TRACE_DEBUG("%s", __func__);



  if (!is_consent && pairing_cb.state == BT_BOND_STATE_BONDING) {

  if (pairing_cb.state == BT_BOND_STATE_BONDING) {

    BTIF_TRACE_DEBUG("%s Discard security request", __func__);

    return;

  }

system/stack/btm/btm_ble.cc

+1 −4
Original line number Diff line number Diff line
@@ -2012,7 +2012,6 @@ uint8_t btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
        p_dev_rec->sec_flags |= BTM_SEC_LE_AUTHENTICATED;

        FALLTHROUGH_INTENDED; /* FALLTHROUGH */



      case SMP_CONSENT_REQ_EVT:

      case SMP_SEC_REQUEST_EVT:

        if (event == SMP_SEC_REQUEST_EVT &&

            btm_cb.pairing_state != BTM_PAIR_STATE_IDLE) {
@@ -2020,9 +2019,7 @@ uint8_t btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
          break;

        }

        btm_cb.pairing_bda = bd_addr;

        if (event != SMP_CONSENT_REQ_EVT) {

        p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;

        }

        btm_cb.pairing_flags |= BTM_PAIR_FLAGS_LE_ACTIVE;

        FALLTHROUGH_INTENDED; /* FALLTHROUGH */