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

Commit 6e3e5b5c authored by Bao Do's avatar Bao Do Committed by Automerger Merge Worker
Browse files

Merge "Allow retry when calling getProviderCapabilities from Audio HAL." into main am: de5097eb 

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



Change-Id: I16a1aef532033865f2fdd0ef99371e2ec91b1bda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70c77135 de5097eb

system/audio_hal_interface/aidl/client_interface_aidl.cc

+4 −3
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { 
    auto aidl_retval =

            provider_factory->getProviderCapabilities(transport_->GetSessionType(), &capabilities_);

    if (!aidl_retval.isOk()) {

      log::fatal("BluetoothAudioHal::getProviderCapabilities failure: {}",

                 aidl_retval.getDescription());

      return;

      log::error("BluetoothAudioHal::getProviderCapabilities failure: {}, retry number {}",

                 aidl_retval.getDescription(), retry_no + 1);

      continue;

    }

    if (capabilities_.empty()) {

      log::warn("SessionType={} Not supported by BluetoothAudioHal",
@@ -216,6 +216,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { 
      break;

    }

  }

  log::assert_that(provider_factory_ != nullptr, "assert failed: provider_factory_ != nullptr");

  log::assert_that(provider_ != nullptr, "assert failed: provider_ != nullptr");



  binder_status_t binder_status =