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

Commit 300deef4 authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Automerger Merge Worker
Browse files

Merge "Add a flag for Channel Sounding in stack" into main am: 4d1430b2 am: 40bf3294 

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



Change-Id: I1ad9b621ac8bcdf0e4a596db100b86d91cda6886
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb3d1032 40bf3294

flags/ranging.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ flag { 
    description: "Enable Channel Sounding"

    bug: "317683528"

}



flag {

    name: "channel_sounding_in_stack"

    namespace: "bluetooth"

    description: "Enable Channel Sounding in the Bluetooth stack"

    bug: "324185011"

}
 
 No newline at end of file

system/gd/hci/distance_measurement_manager.cc

+3 −3
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ struct DistanceMeasurementManager::impl { 
    hci_layer_->RegisterLeEventHandler(

        hci::SubeventCode::TRANSMIT_POWER_REPORTING,

        handler_->BindOn(this, &impl::on_transmit_power_reporting));

    if (!IS_FLAG_ENABLED(channel_sounding)) {

      LOG_INFO("IS_FLAG_ENABLED channel_sounding: false");

    if (!IS_FLAG_ENABLED(channel_sounding_in_stack)) {

      LOG_INFO("IS_FLAG_ENABLED channel_sounding_in_stack: false");

      return;

    }

    distance_measurement_interface_ = hci_layer_->GetDistanceMeasurementInterface(
@@ -172,7 +172,7 @@ struct DistanceMeasurementManager::impl { 
        "connection_handle: %d, address: %s",

        connection_handle,

        ADDRESS_TO_LOGGABLE_CSTR(cs_remote_address));

    if (!IS_FLAG_ENABLED(channel_sounding)) {

    if (!IS_FLAG_ENABLED(channel_sounding_in_stack)) {

      LOG_ERROR("Channel Sounding is not enabled");

      distance_measurement_callbacks_->OnDistanceMeasurementStartFail(

          cs_remote_address, REASON_INTERNAL_ERROR, METHOD_CS);