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

Commit c8db5d6b authored by Steven Liu's avatar Steven Liu
Browse files

handle the procedure enable command error 

1. avoid sending 'enable' when the session is stopped.
2. work around the 'disable' error from controller.

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 368617974
Test: m com.android.btservices
Change-Id: I7e86bebae8ed7fb51300bdb911f519d3b94afc1c
parent 48c5057f

system/gd/hci/distance_measurement_manager.cc

+24 −1
Original line number Diff line number Diff line
@@ -635,10 +635,33 @@ struct DistanceMeasurementManager::impl : bluetooth::hal::RangingHalCallback { 
      return;

    }



    if (!cs_trackers_[connection_handle].measurement_ongoing) {

      log::error("safe guard, error state, no local measurement request.");

      if (cs_trackers_[connection_handle].repeating_alarm) {

        cs_trackers_[connection_handle].repeating_alarm->Cancel();

      }

      return;

    }



    hci_layer_->EnqueueCommand(

            LeCsProcedureEnableBuilder::Create(connection_handle,

                                               cs_trackers_[connection_handle].config_id, enable),

            handler_->BindOnceOn(this, &impl::on_cs_setup_command_status_cb, connection_handle));

            handler_->BindOnceOn(this, &impl::on_cs_procedure_enable_command_status_cb,

                                 connection_handle, enable));

  }



  void on_cs_procedure_enable_command_status_cb(uint16_t connection_handle, Enable enable,

                                                CommandStatusView status_view) {

    ErrorCode status = status_view.GetStatus();

    // controller may send error if the procedure instance has finished all scheduled procedures.

    if (enable == Enable::DISABLED && status == ErrorCode::COMMAND_DISALLOWED) {

      log::info("ignored the procedure disable command disallow error.");

      if (cs_trackers_.find(connection_handle) != cs_trackers_.end()) {

        reset_tracker_on_stopped(&cs_trackers_[connection_handle]);

      }

    } else {

      on_cs_setup_command_status_cb(connection_handle, status_view);

    }

  }



  void on_cs_setup_command_status_cb(uint16_t connection_handle, CommandStatusView status_view) {