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

Commit 726e2754 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Connect inquiry API query implementation" am: e26de87a am: 21877e2a 

am: 21d7db58

Change-Id: Id190fce14fd825d610336ca8560db5bd0b57bdcd
parents 7dc135b2 21d7db58

system/main/shim/btm.cc

+8 −0
Original line number Diff line number Diff line
@@ -234,6 +234,14 @@ void bluetooth::shim::Btm::CancelPeriodicInquiry() { 
  bluetooth::shim::GetInquiry()->StopPeriodicInquiry();

}



bool bluetooth::shim::Btm::IsGeneralPeriodicInquiryActive() const {

  return bluetooth::shim::GetInquiry()->IsGeneralPeriodicInquiryActive();

}



bool bluetooth::shim::Btm::IsLimitedPeriodicInquiryActive() const {

  return bluetooth::shim::GetInquiry()->IsLimitedPeriodicInquiryActive();

}



/**

 * Discoverability

 */

system/main/shim/btm.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ class Btm { 
                            uint16_t min_delay,

                            tBTM_INQ_RESULTS_CB* p_results_cb);

  void CancelPeriodicInquiry();

  bool IsGeneralPeriodicInquiryActive() const;

  bool IsLimitedPeriodicInquiryActive() const;



  void SetClassicGeneralDiscoverability(uint16_t window, uint16_t interval);

  void SetClassicLimitedDiscoverability(uint16_t window, uint16_t interval);

system/main/shim/btm_api.cc

+8 −5
Original line number Diff line number Diff line
@@ -441,12 +441,15 @@ uint16_t bluetooth::shim::BTM_ReadConnectability(uint16_t* p_window, 
 *

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

uint16_t bluetooth::shim::BTM_IsInquiryActive(void) {

  LOG_INFO(LOG_TAG, "UNIMPLEMENTED %s", __func__);

  if (!shim_btm.IsInquiryActive()) {

    return BTM_INQUIRY_INACTIVE;

  }



  if (shim_btm.IsLimitedInquiryActive()) {

    return BTM_LIMITED_INQUIRY_ACTIVE;

  } else if (shim_btm.IsGeneralInquiryActive()) {

    return BTM_GENERAL_INQUIRY_ACTIVE;

  } else if (shim_btm.IsGeneralPeriodicInquiryActive() ||

             shim_btm.IsLimitedPeriodicInquiryActive()) {

    return BTM_PERIODIC_INQUIRY_ACTIVE;

  }

  return BTM_INQUIRY_INACTIVE;

}



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