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

Commit c86032d2 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

[20/24] Canonical form tBTM_STATUS::BTM_NOT_AUTHORIZED am: 93a88ff3 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3225431



Change-Id: I0b72bdf0e1a5f01a6269b7262448c5669117fc38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0cb4751 93a88ff3

system/bta/dm/bta_dm_sec.cc

+15 −12
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void bta_dm_ble_sirk_sec_cb_register(tBTA_DM_SEC_CBACK* p_cback) { 
void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr, bool accept) {

  log::debug("addr:{}", bd_addr);

  get_btm_client_interface().security.BTM_BleSirkConfirmDeviceReply(

          bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED);

          bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED);

}



void bta_dm_consolidate(const RawAddress& identity_addr, const RawAddress& rpa) {
@@ -169,21 +169,23 @@ void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg) { 
    get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr, tBTM_STATUS::BTM_SUCCESS,

                                                         msg->pin_len, msg->p_pin);

  } else {

    get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr, BTM_NOT_AUTHORIZED, 0, NULL);

    get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr,

                                                         tBTM_STATUS::BTM_NOT_AUTHORIZED, 0, NULL);

  }

}



/** Send the user confirm request reply in response to a request from BTM */

void bta_dm_confirm(const RawAddress& bd_addr, bool accept) {

  get_btm_client_interface().security.BTM_SecConfirmReqReply(

          accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, BT_TRANSPORT_BR_EDR, bd_addr);

          accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, BT_TRANSPORT_BR_EDR,

          bd_addr);

}



/** respond to the OOB data request for the remote device from BTM */

void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg) {

  get_btm_client_interface().security.BTM_RemoteOobDataReply(

          msg->accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, msg->bd_addr, msg->c,

          msg->r);

          msg->accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, msg->bd_addr,

          msg->c, msg->r);

}



/*******************************************************************************
@@ -254,7 +256,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
static tBTM_STATUS bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                    const BD_NAME bd_name, bool min_16_digit) {

  if (!bta_dm_sec_cb.p_sec_cback) {

    return BTM_NOT_AUTHORIZED;

    return tBTM_STATUS::BTM_NOT_AUTHORIZED;

  }



  /* If the device name is not known, save bdaddr and devclass and initiate a
@@ -395,7 +397,7 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) 


  log::verbose("event:{}", sp_evt_to_text(event));

  if (!bta_dm_sec_cb.p_sec_cback) {

    return BTM_NOT_AUTHORIZED;

    return tBTM_STATUS::BTM_NOT_AUTHORIZED;

  }



  bool sp_rmt_result = false;
@@ -509,7 +511,7 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) 
    }



    default:

      status = BTM_NOT_AUTHORIZED;

      status = tBTM_STATUS::BTM_NOT_AUTHORIZED;

      break;

  }

  log::verbose("dm status:{}", status);
@@ -660,7 +662,7 @@ static tBTM_STATUS bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda 
  log::debug("addr:{},event:{}", bda, ble_evt_to_text(event));



  if (!bta_dm_sec_cb.p_sec_cback) {

    return BTM_NOT_AUTHORIZED;

    return tBTM_STATUS::BTM_NOT_AUTHORIZED;

  }



  memset(&sec_event, 0, sizeof(tBTA_DM_SEC));
@@ -774,7 +776,7 @@ static tBTM_STATUS bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda 
      break;



    default:

      status = BTM_NOT_AUTHORIZED;

      status = tBTM_STATUS::BTM_NOT_AUTHORIZED;

      break;

  }

  return status;
@@ -966,14 +968,15 @@ void bta_dm_add_ble_device(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
 ******************************************************************************/

void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept, uint32_t passkey) {

  get_btm_client_interface().security.BTM_BlePasskeyReply(

          bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, passkey);

          bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, passkey);

}



/** This is response to SM numeric comparison request submitted to application.

 */

void bta_dm_ble_confirm_reply(const RawAddress& bd_addr, bool accept) {

  get_btm_client_interface().security.BTM_SecConfirmReqReply(

          accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, BT_TRANSPORT_LE, bd_addr);

          accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, BT_TRANSPORT_LE,

          bd_addr);

}



/** This function set the local device LE privacy settings. */

system/stack/btm/btm_sec.cc

+5 −5
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr) { 
        l2cu_update_lcb_4_bonding(bd_addr, false);

      }



      return BTM_NOT_AUTHORIZED;

      return tBTM_STATUS::BTM_NOT_AUTHORIZED;

    } else /*HCI link is not up */

    {

      /* If the HCI link creation was started by Bonding process */
@@ -905,7 +905,7 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr) { 
        btm_sec_cb.pairing_flags |= BTM_PAIR_FLAGS_WE_CANCEL_DD;

        return tBTM_STATUS::BTM_CMD_STARTED;

      }

      return BTM_NOT_AUTHORIZED;

      return tBTM_STATUS::BTM_NOT_AUTHORIZED;

    }

  }
@@ -2748,10 +2748,10 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const RawAddress bda, const uint32_t 


    if (btm_sec_cb.api.p_sp_callback) {

      status = (*btm_sec_cb.api.p_sp_callback)(event, &evt_data);

      if (status != BTM_NOT_AUTHORIZED) {

      if (status != tBTM_STATUS::BTM_NOT_AUTHORIZED) {

        return;

      }

      /* else BTM_NOT_AUTHORIZED means when the app wants to reject the req

      /* else tBTM_STATUS::BTM_NOT_AUTHORIZED means when the app wants to reject the req

       * right now */

    } else if ((event == BTM_SP_CFM_REQ_EVT) && (evt_data.cfm_req.just_works)) {

      /* automatically reply with just works if no sp_cback */
@@ -2873,7 +2873,7 @@ void btm_rem_oob_req(const RawAddress bd_addr) { 


    btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_LOCAL_OOB_RSP);

    if ((*btm_sec_cb.api.p_sp_callback)(BTM_SP_RMT_OOB_EVT, (tBTM_SP_EVT_DATA*)&evt_data) ==

        BTM_NOT_AUTHORIZED) {

        tBTM_STATUS::BTM_NOT_AUTHORIZED) {

      BTM_RemoteOobDataReply(static_cast<tBTM_STATUS>(true), p_bda, c, r);

    }

    return;

system/stack/l2cap/l2c_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, uint16_t p 
      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION;

    case BTM_NOT_ENCRYPTED:

      return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP;

    case BTM_NOT_AUTHORIZED:

    case tBTM_STATUS::BTM_NOT_AUTHORIZED:

      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHORIZATION;

    case tBTM_STATUS::BTM_INSUFFICIENT_ENCRYPT_KEY_SIZE:

      return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP_KEY_SIZE;