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

Commit 083de742 authored by Christine Hallstrom's avatar Christine Hallstrom
Browse files

Clean up trigger_advertising_callbacks_on_first_resume_after_pause 

This flag has been enabled for some time now, so clean up the flag
definition.

Bug: 290847007
Test: m com.android.btservices
Flag: EXEMPT, flag cleanup, no logic change
Change-Id: If40c1bb52c37ae13d4844b85209383b10cc5cc80
parent 4d7eaf26

system/gd/hci/le_advertising_manager.cc

+19 −30
Original line number Diff line number Diff line
@@ -1487,16 +1487,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        case (AdvertisingApiType::LEGACY): {

          le_advertising_interface_->EnqueueCommand(

              hci::LeSetAdvertisingEnableBuilder::Create(Enable::ENABLED),

              common::init_flags::

                      trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled()

                  ? module_handler_->BindOnceOn(

              module_handler_->BindOnceOn(

                  this,

                        &impl::on_set_advertising_enable_complete<

                            LeSetAdvertisingEnableCompleteView>,

                  &impl::on_set_advertising_enable_complete<LeSetAdvertisingEnableCompleteView>,

                  true,

                  enabled_sets,

                        false /* trigger_callbacks */)

                  : module_handler_->BindOnce(check_complete<LeSetAdvertisingEnableCompleteView>));

                  false /* trigger_callbacks */));

        } break;

        case (AdvertisingApiType::ANDROID_HCI): {

          for (size_t i = 0; i < enabled_sets_.size(); i++) {
@@ -1504,15 +1500,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
            if (id != kInvalidHandle) {

              le_advertising_interface_->EnqueueCommand(

                  hci::LeMultiAdvtSetEnableBuilder::Create(Enable::ENABLED, id),

                  common::init_flags::

                          trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled()

                      ? module_handler_->BindOnceOn(

                  module_handler_->BindOnceOn(

                      this,

                      &impl::on_set_advertising_enable_complete<LeMultiAdvtCompleteView>,

                      true,

                      enabled_sets,

                            false /* trigger_callbacks */)

                      : module_handler_->BindOnce(check_complete<LeMultiAdvtCompleteView>));

                      false /* trigger_callbacks */));

            }

          }

        } break;
@@ -1520,17 +1513,13 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
          if (enabled_sets.size() != 0) {

            le_advertising_interface_->EnqueueCommand(

                hci::LeSetExtendedAdvertisingEnableBuilder::Create(Enable::ENABLED, enabled_sets),

                common::init_flags::

                        trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled()

                    ? module_handler_->BindOnceOn(

                module_handler_->BindOnceOn(

                    this,

                    &impl::on_set_extended_advertising_enable_complete<

                        LeSetExtendedAdvertisingEnableCompleteView>,

                    true,

                    enabled_sets,

                          false /* trigger_callbacks */)

                    : module_handler_->BindOnce(

                          check_complete<LeSetExtendedAdvertisingEnableCompleteView>));

                    false /* trigger_callbacks */));

          }

        } break;

      }

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ init_flags!( 
        bluetooth_quality_report_callback = true,

        set_min_encryption = true,

        subrating = true,

        trigger_advertising_callbacks_on_first_resume_after_pause = true,

        use_unified_connection_manager,

        sdp_return_classic_services_when_le_discovery_fails = true,

        use_rsi_from_cached_inqiry_results = false,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ mod ffi { 
        fn bluetooth_quality_report_callback_is_enabled() -> bool;

        fn set_min_encryption_is_enabled() -> bool;

        fn subrating_is_enabled() -> bool;

        fn trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled() -> bool;

        fn use_unified_connection_manager_is_enabled() -> bool;

        fn sdp_return_classic_services_when_le_discovery_fails_is_enabled() -> bool;

        fn use_rsi_from_cached_inqiry_results_is_enabled() -> bool;