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

Commit 7302c97d authored by Yuyang Huang's avatar Yuyang Huang Committed by Gerrit Code Review
Browse files

Merge "Reset pending command after Confirm and Cancel StreamingRequest" into main

parents c35d8128 90aed9e2

system/audio_hal_interface/hfp_client_interface.cc

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ void HfpClientInterface::Decode::ConfirmStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpDecodingTransport::software_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::SUCCESS_FINISHED);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");
@@ -209,6 +210,7 @@ void HfpClientInterface::Decode::CancelStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpDecodingTransport::software_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::FAILURE);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");
@@ -339,6 +341,7 @@ void HfpClientInterface::Encode::ConfirmStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpEncodingTransport::software_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::SUCCESS_FINISHED);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");
@@ -355,6 +358,7 @@ void HfpClientInterface::Encode::CancelStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpEncodingTransport::software_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::FAILURE);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");
@@ -475,6 +479,7 @@ void HfpClientInterface::Offload::ConfirmStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpEncodingTransport::offloading_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::SUCCESS_FINISHED);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");
@@ -491,6 +496,7 @@ void HfpClientInterface::Offload::CancelStreamingRequest() { 
    case aidl::hfp::HFP_CTRL_CMD_START:

      aidl::hfp::HfpEncodingTransport::offloading_hal_interface->StreamStarted(

          aidl::BluetoothAudioCtrlAck::FAILURE);

      instance->ResetPendingCmd();

      return;

    case aidl::hfp::HFP_CTRL_CMD_NONE:

      LOG_WARN("no pending start stream request");