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

Commit 5e1da984 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "HAL: Avoid FATAL log on expected transaction status" into tm-dev am:... 

Merge "HAL: Avoid FATAL log on expected transaction status" into tm-dev am: e880d219 am: 395bd097

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



Change-Id: I621c3e3cad04188ef6168fa4243280f111832809
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99d2dca8 395bd097

system/audio_hal_interface/aidl/client_interface_aidl.cc

+8 −2
Original line number Diff line number Diff line
@@ -279,8 +279,14 @@ int BluetoothAudioClientInterface::StartSession() { 
  auto aidl_retval = provider_->startSession(

      stack_if, transport_->GetAudioConfiguration(), latency_modes, &mq_desc);

  if (!aidl_retval.isOk()) {

    if (aidl_retval.getExceptionCode() == EX_ILLEGAL_ARGUMENT) {

      LOG(ERROR) << __func__ << ": BluetoothAudioHal Error: "

                 << aidl_retval.getDescription() << ", audioConfig="

                 << transport_->GetAudioConfiguration().toString();

    } else {

      LOG(FATAL) << __func__ << ": BluetoothAudioHal failure: "

                 << aidl_retval.getDescription();

    }

    return -EPROTO;

  }

  data_mq.reset(new DataMQ(mq_desc));