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

Commit a2e7b607 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove inquiry filtering from shim 

not used in the legacy after all

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If3136d4441c87763ed1df67f781b850ec02deb47
parent a26753b9

system/main/shim/btm.cc

+0 −26
Original line number Diff line number Diff line
@@ -334,32 +334,6 @@ void Btm::OnInquiryComplete(bluetooth::hci::ErrorCode status) { 
  active_inquiry_mode_ = kInquiryModeOff;

}



bool Btm::SetInquiryFilter(uint8_t mode, uint8_t type,

                           tBTM_INQ_FILT_COND data) {

  switch (mode) {

    case kInquiryModeOff:

      break;

    case kLimitedInquiryMode:

      LOG_WARN("UNIMPLEMENTED %s", __func__);

      break;

    case kGeneralInquiryMode:

      LOG_WARN("UNIMPLEMENTED %s", __func__);

      break;

    default:

      LOG_WARN("%s Unknown inquiry mode:%d", __func__, mode);

      return false;

  }

  return true;

}



void Btm::SetFilterInquiryOnAddress() {

  LOG_WARN("UNIMPLEMENTED %s", __func__);

}



void Btm::SetFilterInquiryOnDevice() { LOG_WARN("UNIMPLEMENTED %s", __func__); }



void Btm::ClearInquiryFilter() { LOG_WARN("UNIMPLEMENTED %s", __func__); }



void Btm::SetStandardInquiryResultMode() {

  GetInquiry()->SetStandardInquiryResultMode();

}

system/main/shim/btm.h

+0 −11
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ static constexpr int kStandardInquiryResult = 0; 
static constexpr int kInquiryResultWithRssi = 1;

static constexpr int kExtendedInquiryResult = 2;



/* Inquiry filter types */

static constexpr int kClearInquiryFilter = 0;

static constexpr int kFilterOnDeviceClass = 1;

static constexpr int kFilterOnAddress = 2;



static constexpr uint8_t kPhyConnectionNone = 0x00;

static constexpr uint8_t kPhyConnectionLe1M = 0x01;

static constexpr uint8_t kPhyConnectionLe2M = 0x02;
@@ -122,12 +117,6 @@ class Btm { 
  void OnExtendedInquiryResult(bluetooth::hci::ExtendedInquiryResultView view);

  void OnInquiryComplete(bluetooth::hci::ErrorCode status);



  // Inquiry API

  bool SetInquiryFilter(uint8_t mode, uint8_t type, tBTM_INQ_FILT_COND data);

  void SetFilterInquiryOnAddress();

  void SetFilterInquiryOnDevice();

  void ClearInquiryFilter();



  void SetStandardInquiryResultMode();

  void SetInquiryWithRssiResultMode();

  void SetExtendedInquiryResultMode();