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

Commit d4e5b800 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BluetoothAudioHAL: Wait for A2DP not playing if receiving A2dpSuspended=true" am: 5e8fe254 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1690589

Change-Id: I5f92963d0256948b49df1bdcf847123a35050133
parents 0c0f8f39 5e8fe254

system/audio_bluetooth_hw/stream_apis.cc

+10 −2
Original line number Diff line number Diff line
@@ -341,8 +341,12 @@ static int out_set_parameters(struct audio_stream* stream, 
    if (params["A2dpSuspended"] == "true") {

      LOG(INFO) << __func__ << ": state=" << out->bluetooth_output_.GetState()

                << " stream param stopped";

      if (out->bluetooth_output_.GetState() != BluetoothStreamState::DISABLED) {

      out->frames_rendered_ = 0;

      if (out->bluetooth_output_.GetState() == BluetoothStreamState::STARTED) {

        out->bluetooth_output_.Suspend();

        out->bluetooth_output_.SetState(BluetoothStreamState::DISABLED);

      } else if (out->bluetooth_output_.GetState() !=

                 BluetoothStreamState::DISABLED) {

        out->bluetooth_output_.Stop();

      }

    } else {
@@ -498,6 +502,10 @@ static ssize_t out_write(struct audio_stream_out* stream, const void* buffer, 
    if (stream->resume(stream)) {

      LOG(ERROR) << __func__ << ": state=" << out->bluetooth_output_.GetState()

                 << " failed to resume";

      if (out->bluetooth_output_.GetState() == BluetoothStreamState::DISABLED) {

        // drop data for cases of A2dpSuspended=true / closing=true

        totalWritten = bytes;

      }

      usleep(kBluetoothDefaultOutputBufferMs * 1000);

      return totalWritten;

    }