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

Commit e6da4cc3 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes I3d2be3fc,I2a084526 into main am: adeab505

parents 89931ccb adeab505
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -84,11 +84,6 @@ static void initNative(JNIEnv* env, jobject object) {
  std::unique_lock<std::shared_timed_mutex> interface_lock(interface_mutex);
  std::unique_lock<std::shared_timed_mutex> callbacks_lock(callbacks_mutex);

  if (!bluetooth::common::InitFlags::
          IsBluetoothQualityReportCallbackEnabled()) {
    return;
  }

  const bt_interface_t* btInf = getBluetoothInterface();
  if (btInf == nullptr) {
    log::error("Bluetooth module is not loaded");
+2 −6
Original line number Diff line number Diff line
@@ -928,12 +928,8 @@ static const void* get_profile_interface(const char* profile_id) {
  if (is_profile(profile_id, BT_PROFILE_CSIS_CLIENT_ID))
    return btif_csis_client_get_interface();

  bool isBqrEnabled =
      bluetooth::common::InitFlags::IsBluetoothQualityReportCallbackEnabled();
  if (isBqrEnabled) {
  if (is_profile(profile_id, BT_BQR_ID))
    return bluetooth::bqr::getBluetoothQualityReportInterface();
  }

  return NULL;
}
+18 −24
Original line number Diff line number Diff line
@@ -528,9 +528,7 @@ void ConfigureBqrCmpl(uint32_t current_evt_mask) {
  tBTM_STATUS btm_status = BTM_BT_Quality_Report_VSE_Register(
      current_evt_mask > kQualityEventMaskAllOff, CategorizeBqrEvent);

  bool isBqrEnabled =
      bluetooth::common::InitFlags::IsBluetoothQualityReportCallbackEnabled();
  if (isBqrEnabled && current_evt_mask > kQualityEventMaskAllOff) {
  if (current_evt_mask > kQualityEventMaskAllOff) {
    ConfigBqrA2dpScoThreshold();
  }

@@ -641,9 +639,6 @@ void AddLinkQualityEventToQueue(uint8_t length,
#else
  // TODO(abps) Metrics for non-Android build
#endif
  bool isBqrEnabled =
      bluetooth::common::InitFlags::IsBluetoothQualityReportCallbackEnabled();
  if (isBqrEnabled) {
  BluetoothQualityReportInterface* bqrItf =
      getBluetoothQualityReportInterface();

@@ -666,7 +661,6 @@ void AddLinkQualityEventToQueue(uint8_t length,
  } else {
    log::warn("failed to deliver BQR, bqrItf is NULL");
  }
  }

  kpBqrEventQueue->Enqueue(p_bqr_event.release());
}
+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ class InitFlags final {
    return init_flags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled();
  }

  inline static bool IsBluetoothQualityReportCallbackEnabled() {
    return init_flags::bluetooth_quality_report_callback_is_enabled();
  }

  inline static bool IsTargetedAnnouncementReconnectionMode() {
    return init_flags::leaudio_targeted_announcement_reconnection_mode_is_enabled();
  }
+0 −6
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ TEST(InitFlagsTest, test_device_iot_config_logging_is_enabled) {
  ASSERT_TRUE(InitFlags::IsDeviceIotConfigLoggingEnabled());
}

TEST(InitFlagsTest, test_enable_bluetooth_quality_report_callback) {
  const char* input[] = {"INIT_bluetooth_quality_report_callback=true", nullptr};
  InitFlags::Load(input);
  ASSERT_TRUE(InitFlags::IsBluetoothQualityReportCallbackEnabled());
}

TEST(InitFlagsTest, test_enable_use_rsi_from_cached_inqiry_results) {
  const char* input[] = {"INIT_use_rsi_from_cached_inqiry_results=true", nullptr};
  InitFlags::Load(input);
Loading