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

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

tBTM_STATUS: Class enum-ification 

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Idc552ca80f34329286c10956111548ed542ff089
parent be578012

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { 
    switch (status) {

      case tBTM_STATUS::BTM_CMD_STARTED:

        break;

      case BTM_MODE_UNSUPPORTED:

      case tBTM_STATUS::BTM_MODE_UNSUPPORTED:

      case tBTM_STATUS::BTM_DEV_RESTRICT_LISTED:

        // Role switch can never happen, but indicate to caller

        // a result such that a timer will not start to repeatedly

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -3614,7 +3614,7 @@ static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) { 
  pairing_cb.is_le_only = true;

  pairing_cb.is_le_nc = false;



  BTM_BleOobDataReply(req_oob_type->bd_addr, BTM_SUCCESS, 16, oob_cb.p192_data.sm_tk);

  BTM_BleOobDataReply(req_oob_type->bd_addr, tBTM_STATUS::BTM_SUCCESS, 16, oob_cb.p192_data.sm_tk);

}



static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) {

system/btif/src/btif_gatt_client.cc

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void btm_read_rssi_cb(void* p_void) { 
  }



  CLI_CBACK_IN_JNI(read_remote_rssi_cb, rssi_request_client_if, p_result->rem_bda, p_result->rssi,

                   p_result->status);

                   static_cast<uint8_t>(p_result->status));

}



/*******************************************************************************
@@ -590,7 +590,7 @@ static bt_status_t btif_gattc_read_remote_rssi(int client_if, const RawAddress& 
  return do_in_jni_thread(base::Bind(

          [](int client_if, const RawAddress& bd_addr) {

            if (get_btm_client_interface().link_controller.BTM_ReadRSSI(

                        bd_addr, btm_read_rssi_cb) != BTM_CMD_STARTED) {

                        bd_addr, btm_read_rssi_cb) != tBTM_STATUS::BTM_CMD_STARTED) {

              log::warn("Unable to read RSSI peer:{} client_if:{}", bd_addr, client_if);

            }

          },

system/gd/metrics/bluetooth_event.cc

+2 −2
Original line number Diff line number Diff line
@@ -111,11 +111,11 @@ void LogAclAfterRemoteNameRequest(const RawAddress& raw_address, tBTM_STATUS sta 
  hci::Address address = bluetooth::ToGdAddress(raw_address);



  switch (status) {

    case BTM_SUCCESS:

    case tBTM_STATUS::BTM_SUCCESS:

      bluetooth::os::LogMetricBluetoothEvent(address, EventType::ACL_CONNECTION_INITIATOR,

                                             State::ALREADY_CONNECTED);

      break;

    case BTM_NO_RESOURCES:

    case tBTM_STATUS::BTM_NO_RESOURCES:

      bluetooth::os::LogMetricBluetoothEvent(

              address, EventType::ACL_CONNECTION_INITIATOR,

              MapErrorCodeToState(ErrorCode::CONNECTION_REJECTED_LIMITED_RESOURCES));

system/main/shim/le_scanning_manager.cc

+4 −4
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



using bluetooth::ToGdAddress;

using bluetooth::ToRawAddress;

using namespace bluetooth;



extern tBTM_CB btm_cb;
@@ -411,7 +409,8 @@ void BleScannerInterfaceImpl::TransferSync(RawAddress address, uint16_t service_ 
  if (p_acl == NULL ||

      !HCI_LE_PERIODIC_ADVERTISING_SYNC_TRANSFER_RECIPIENT(p_acl->peer_le_features)) {

    log::error("[PAST] Remote doesn't support PAST");

    scanning_callbacks_->OnPeriodicSyncTransferred(pa_source, BTM_MODE_UNSUPPORTED, address);

    scanning_callbacks_->OnPeriodicSyncTransferred(

            pa_source, static_cast<uint8_t>(tBTM_STATUS::BTM_MODE_UNSUPPORTED), address);

    return;

  }
@@ -426,7 +425,8 @@ void BleScannerInterfaceImpl::TransferSetInfo(RawAddress address, uint16_t servi 
  if (p_acl == NULL ||

      !HCI_LE_PERIODIC_ADVERTISING_SYNC_TRANSFER_RECIPIENT(p_acl->peer_le_features)) {

    log::error("[PAST] Remote doesn't support PAST");

    scanning_callbacks_->OnPeriodicSyncTransferred(pa_source, BTM_MODE_UNSUPPORTED, address);

    scanning_callbacks_->OnPeriodicSyncTransferred(

            pa_source, static_cast<uint8_t>(tBTM_STATUS::BTM_MODE_UNSUPPORTED), address);

    return;

  }