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

Commit 08f99b98 authored by cmanton@google.com's avatar cmanton@google.com Committed by Automerger Merge Worker
Browse files

Comment out unused variables [main_shim_] am: 7ffafd15 

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



Change-Id: I20ca2b924e374909d36ee10f0f53263b7826cfb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da3db35a 7ffafd15

system/main/shim/acl.cc

+30 −23
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ class ClassicShimAclConnection 
    TRY_POSTING_ON_MAIN(interface_.on_change_connection_link_key_complete);

  }



  void OnReadClockOffsetComplete(uint16_t clock_offset) override {

  void OnReadClockOffsetComplete(uint16_t /* clock_offset */) override {

    LOG_INFO("UNIMPLEMENTED");

  }
@@ -563,66 +563,73 @@ class ClassicShimAclConnection 
                        minimum_remote_timeout, minimum_local_timeout);

  }



  void OnQosSetupComplete(hci::ServiceType service_type, uint32_t token_rate,

                          uint32_t peak_bandwidth, uint32_t latency,

                          uint32_t delay_variation) override {

  void OnQosSetupComplete(hci::ServiceType /* service_type */,

                          uint32_t /* token_rate */,

                          uint32_t /* peak_bandwidth */, uint32_t /* latency */,

                          uint32_t /* delay_variation */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnFlowSpecificationComplete(hci::FlowDirection flow_direction,

                                   hci::ServiceType service_type,

                                   uint32_t token_rate,

                                   uint32_t token_bucket_size,

                                   uint32_t peak_bandwidth,

                                   uint32_t access_latency) override {

  void OnFlowSpecificationComplete(hci::FlowDirection /* flow_direction */,

                                   hci::ServiceType /* service_type */,

                                   uint32_t /* token_rate */,

                                   uint32_t /* token_bucket_size */,

                                   uint32_t /* peak_bandwidth */,

                                   uint32_t /* access_latency */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnFlushOccurred() override { LOG_INFO("UNIMPLEMENTED"); }



  void OnRoleDiscoveryComplete(hci::Role current_role) override {

  void OnRoleDiscoveryComplete(hci::Role /* current_role */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadLinkPolicySettingsComplete(

      uint16_t link_policy_settings) override {

      uint16_t /* link_policy_settings */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadAutomaticFlushTimeoutComplete(uint16_t flush_timeout) override {

  void OnReadAutomaticFlushTimeoutComplete(

      uint16_t /* flush_timeout */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadTransmitPowerLevelComplete(uint8_t transmit_power_level) override {

  void OnReadTransmitPowerLevelComplete(

      uint8_t /* transmit_power_level */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadLinkSupervisionTimeoutComplete(

      uint16_t link_supervision_timeout) override {

      uint16_t /* link_supervision_timeout */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadFailedContactCounterComplete(

      uint16_t failed_contact_counter) override {

      uint16_t /* failed_contact_counter */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadLinkQualityComplete(uint8_t link_quality) override {

  void OnReadLinkQualityComplete(uint8_t /* link_quality */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadAfhChannelMapComplete(

      hci::AfhMode afh_mode, std::array<uint8_t, 10> afh_channel_map) override {

      hci::AfhMode /* afh_mode */,

      std::array<uint8_t, 10> /* afh_channel_map */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadRssiComplete(uint8_t rssi) override { LOG_INFO("UNIMPLEMENTED"); }

  void OnReadRssiComplete(uint8_t /* rssi */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnReadClockComplete(uint32_t clock, uint16_t accuracy) override {

  void OnReadClockComplete(uint32_t /* clock */,

                           uint16_t /* accuracy */) override {

    LOG_INFO("UNIMPLEMENTED");

  }



  void OnCentralLinkKeyComplete(hci::KeyFlag key_flag) override {

  void OnCentralLinkKeyComplete(hci::KeyFlag /* key_flag */) override {

    LOG_INFO("%s UNIMPLEMENTED", __func__);

  }
@@ -807,8 +814,8 @@ class LeShimAclConnection 
                        manufacturer_name, sub_version);

  }



  void OnLeReadRemoteFeaturesComplete(hci::ErrorCode hci_status,

                                      uint64_t features) {

  void OnLeReadRemoteFeaturesComplete(hci::ErrorCode /* hci_status */,

                                      uint64_t /* features */) {

    // TODO

  }

system/main/shim/acl_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ void bluetooth::shim::ACL_LeSubrateRequest( 


void bluetooth::shim::ACL_RemoteNameRequest(const RawAddress& addr,

                                            uint8_t page_scan_rep_mode,

                                            uint8_t page_scan_mode,

                                            uint8_t /* page_scan_mode */,

                                            uint16_t clock_offset) {

  bluetooth::shim::GetRemoteNameRequest()->StartRemoteNameRequest(

      ToGdAddress(addr),

system/main/shim/btm.cc

+38 −34
Original line number Diff line number Diff line
@@ -26,16 +26,16 @@ 
#include <cstring>

#include <mutex>



#include "hci/acl_manager.h"

#include "hci/controller_interface.h"

#include "hci/le_advertising_manager.h"

#include "hci/le_scanning_manager.h"

#include "main/shim/controller.h"

#include "main/shim/entry.h"

#include "main/shim/helpers.h"

#include "neighbor/connectability.h"

#include "neighbor/discoverability.h"

#include "neighbor/inquiry.h"

#include "neighbor/page.h"

#include "security/security_module.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int_types.h"

#include "types/ble_address_with_type.h"
@@ -86,16 +86,17 @@ std::string Btm::ReadRemoteName::AddressString() const { 
}



void Btm::ScanningCallbacks::OnScannerRegistered(

    const bluetooth::hci::Uuid app_uuid, bluetooth::hci::ScannerId scanner_id,

    ScanningStatus status){};

    const bluetooth::hci::Uuid /* app_uuid */,

    bluetooth::hci::ScannerId /* scanner_id */, ScanningStatus /* status */){};



void Btm::ScanningCallbacks::OnSetScannerParameterComplete(

    bluetooth::hci::ScannerId scanner_id, ScanningStatus status){};

    bluetooth::hci::ScannerId /* scanner_id */, ScanningStatus /* status */){};



void Btm::ScanningCallbacks::OnScanResult(

    uint16_t event_type, uint8_t address_type, bluetooth::hci::Address address,

    uint8_t primary_phy, uint8_t secondary_phy, uint8_t advertising_sid,

    int8_t tx_power, int8_t rssi, uint16_t periodic_advertising_interval,

    uint16_t /* event_type */, uint8_t address_type,

    bluetooth::hci::Address address, uint8_t primary_phy, uint8_t secondary_phy,

    uint8_t advertising_sid, int8_t tx_power, int8_t rssi,

    uint16_t periodic_advertising_interval,

    std::vector<uint8_t> advertising_data) {

  tBLE_ADDR_TYPE ble_address_type = to_ble_addr_type(address_type);

  uint16_t extended_event_type = 0;
@@ -118,34 +119,37 @@ void Btm::ScanningCallbacks::OnScanResult( 
}



void Btm::ScanningCallbacks::OnTrackAdvFoundLost(

    bluetooth::hci::AdvertisingFilterOnFoundOnLostInfo on_found_on_lost_info){};

void Btm::ScanningCallbacks::OnBatchScanReports(int client_if, int status,

                                                int report_format,

                                                int num_records,

                                                std::vector<uint8_t> data){};

    bluetooth::hci::

        AdvertisingFilterOnFoundOnLostInfo /* on_found_on_lost_info */){};

void Btm::ScanningCallbacks::OnBatchScanReports(

    int /* client_if */, int /* status */, int /* report_format */,

    int /* num_records */, std::vector<uint8_t> /* data */){};



void Btm::ScanningCallbacks::OnBatchScanThresholdCrossed(int client_if){};

void Btm::ScanningCallbacks::OnBatchScanThresholdCrossed(int /* client_if */){};

void Btm::ScanningCallbacks::OnTimeout(){};

void Btm::ScanningCallbacks::OnFilterEnable(bluetooth::hci::Enable enable,

                                            uint8_t status){};

void Btm::ScanningCallbacks::OnFilterEnable(bluetooth::hci::Enable /* enable */,

                                            uint8_t /* status */){};

void Btm::ScanningCallbacks::OnFilterParamSetup(

    uint8_t available_spaces, bluetooth::hci::ApcfAction action,

    uint8_t status){};

    uint8_t /* available_spaces */, bluetooth::hci::ApcfAction /* action */,

    uint8_t /* status */){};

void Btm::ScanningCallbacks::OnFilterConfigCallback(

    bluetooth::hci::ApcfFilterType filter_type, uint8_t available_spaces,

    bluetooth::hci::ApcfAction action, uint8_t status){};

    bluetooth::hci::ApcfFilterType /* filter_type */,

    uint8_t /* available_spaces */, bluetooth::hci::ApcfAction /* action */,

    uint8_t /* status */){};

void Btm::ScanningCallbacks::OnPeriodicSyncStarted(

    int reg_id, uint8_t status, uint16_t sync_handle, uint8_t advertising_sid,

    bluetooth::hci::AddressWithType address_with_type, uint8_t phy,

    uint16_t interval) {}

void Btm::ScanningCallbacks::OnPeriodicSyncReport(uint16_t sync_handle,

                                                  int8_t tx_power, int8_t rssi,

                                                  uint8_t status,

                                                  std::vector<uint8_t> data) {}

void Btm::ScanningCallbacks::OnPeriodicSyncLost(uint16_t sync_handle) {}

    int /* reg_id */, uint8_t /* status */, uint16_t /* sync_handle */,

    uint8_t /* advertising_sid */,

    bluetooth::hci::AddressWithType /* address_with_type */, uint8_t /* phy */,

    uint16_t /* interval */) {}

void Btm::ScanningCallbacks::OnPeriodicSyncReport(

    uint16_t /* sync_handle */, int8_t /* tx_power */, int8_t /* rssi */,

    uint8_t /* status */, std::vector<uint8_t> /* data */) {}

void Btm::ScanningCallbacks::OnPeriodicSyncLost(uint16_t /* sync_handle */) {}

void Btm::ScanningCallbacks::OnPeriodicSyncTransferred(

    int pa_source, uint8_t status, bluetooth::hci::Address address) {}

void Btm::ScanningCallbacks::OnBigInfoReport(uint16_t sync_handle, bool encrypted) {}

    int /* pa_source */, uint8_t /* status */,

    bluetooth::hci::Address /* address */) {}

void Btm::ScanningCallbacks::OnBigInfoReport(uint16_t /* sync_handle */,

                                             bool /* encrypted */) {}



Btm::Btm(os::Handler* handler, neighbor::InquiryModule* inquiry)

    : scanning_timer_(handler), observing_timer_(handler) {
@@ -241,7 +245,7 @@ bool Btm::IsLimitedInquiryActive() const { return limited_inquiry_active_; } 
bool Btm::StartPeriodicInquiry(uint8_t mode, uint8_t duration,

                               uint8_t max_responses, uint16_t max_delay,

                               uint16_t min_delay,

                               tBTM_INQ_RESULTS_CB* p_results_cb) {

                               tBTM_INQ_RESULTS_CB* /* p_results_cb */) {

  switch (mode) {

    case kInquiryModeOff:

      limited_periodic_inquiry_active_ = false;
@@ -393,8 +397,8 @@ bool Btm::UseLeLink(const RawAddress& raw_address) const { 
  return true;

}



BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address,

                                           tBTM_NAME_CMPL_CB* callback) {

BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& /* raw_address */,

                                           tBTM_NAME_CMPL_CB* /* callback */) {

  LOG_ALWAYS_FATAL("unreachable");

  return BTM_UNDEFINED;

}
@@ -444,7 +448,7 @@ void Btm::SetObservingTimer(uint64_t duration_ms, 


void Btm::CancelObservingTimer() { observing_timer_.Cancel(); }



void Btm::StartScanning(bool use_active_scanning) {

void Btm::StartScanning(bool /* use_active_scanning */) {

  GetScanning()->RegisterScanningCallback(&scanning_callbacks_);

  GetScanning()->Scan(true);

}

system/main/shim/controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ FORWARD_GETTER( 
FORWARD_GETTER(uint8_t, get_le_connect_list_size,

               GetController()->GetLeFilterAcceptListSize())



static void set_ble_resolving_list_max_size(int resolving_list_max_size) {

static void set_ble_resolving_list_max_size(int /* resolving_list_max_size */) {

  LOG_DEBUG("UNSUPPORTED");

}

system/main/shim/le_advertising_manager.cc

+11 −11
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
  }



  void SetParameters(uint8_t advertiser_id, AdvertiseParameters params,

                     ParametersCallback cb) override {

                     ParametersCallback /* cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    bluetooth::hci::AdvertisingConfig config{};

    parse_parameter(config, params);
@@ -101,7 +101,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
  }



  void SetData(int advertiser_id, bool set_scan_rsp, vector<uint8_t> data,

               StatusCallback cb) override {

               StatusCallback /* cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    std::vector<GapData> advertising_data = {};

    parse_gap_data(data, advertising_data);
@@ -109,9 +109,9 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
                                               advertising_data);

  }



  void Enable(uint8_t advertiser_id, bool enable, StatusCallback cb,

  void Enable(uint8_t advertiser_id, bool enable, StatusCallback /* cb */,

              uint16_t duration, uint8_t maxExtAdvEvents,

              StatusCallback timeout_cb) override {

              StatusCallback /* timeout_cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    bluetooth::shim::GetAdvertising()->EnableAdvertiser(

        advertiser_id, enable, duration, maxExtAdvEvents);
@@ -137,14 +137,14 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
  }



  void StartAdvertisingSet(uint8_t client_id, int reg_id,

                           IdTxPowerStatusCallback register_cb,

                           IdTxPowerStatusCallback /* register_cb */,

                           AdvertiseParameters params,

                           std::vector<uint8_t> advertise_data,

                           std::vector<uint8_t> scan_response_data,

                           PeriodicAdvertisingParameters periodic_params,

                           std::vector<uint8_t> periodic_data,

                           uint16_t duration, uint8_t maxExtAdvEvents,

                           IdStatusCallback timeout_cb) {

                           IdStatusCallback /* timeout_cb */) {

    LOG(INFO) << __func__ << " in shim layer";



    bluetooth::hci::AdvertisingConfig config{};
@@ -175,7 +175,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 


  void SetPeriodicAdvertisingParameters(

      int advertiser_id, PeriodicAdvertisingParameters periodic_params,

      StatusCallback cb) override {

      StatusCallback /* cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    bluetooth::hci::PeriodicAdvertisingParameters parameters;

    parameters.max_interval = periodic_params.max_interval;
@@ -186,7 +186,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
  }



  void SetPeriodicAdvertisingData(int advertiser_id, std::vector<uint8_t> data,

                                  StatusCallback cb) override {

                                  StatusCallback /* cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    std::vector<GapData> advertising_data = {};

    parse_gap_data(data, advertising_data);
@@ -196,7 +196,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 


  void SetPeriodicAdvertisingEnable(int advertiser_id, bool enable,

                                    bool include_adi,

                                    StatusCallback cb) override {

                                    StatusCallback /* cb */) override {

    LOG(INFO) << __func__ << " in shim layer";

    bluetooth::shim::GetAdvertising()->EnablePeriodicAdvertising(

        advertiser_id, enable, include_adi);
@@ -211,11 +211,11 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
    native_adv_callbacks_map_[client_id] = callbacks;

  }



  void on_scan(Address address, AddressType address_type) {

  void on_scan(Address /* address */, AddressType /* address_type */) {

    LOG(INFO) << __func__ << " in shim layer";

  }



  void on_set_terminated(ErrorCode error_code, uint8_t, uint8_t) {

  void on_set_terminated(ErrorCode /* error_code */, uint8_t, uint8_t) {

    LOG(INFO) << __func__ << " in shim layer";

  }