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

Commit 52d35143 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove unused getProviderInfo" into main am: 3768c9b3 am: 51d48685 

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



Change-Id: I8296f8ce7573d83045af104a05890ac449bb7b34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81f8ccdf 51d48685

system/audio_hal_interface/aidl/client_interface_aidl.cc

+0 −16
Original line number Diff line number Diff line
@@ -656,22 +656,6 @@ size_t BluetoothAudioSourceClientInterface::WriteAudioData(const uint8_t* p_buf, 
  return total_written;

}



std::optional<IBluetoothAudioProviderFactory::ProviderInfo>

BluetoothAudioClientInterface::GetProviderInfo(SessionType session_type) {

  if (provider_factory_ == nullptr) {

    LOG(WARNING) << __func__ << ": No provider factory";

    return std::nullopt;

  }

  std::optional<IBluetoothAudioProviderFactory::ProviderInfo> provider_info;

  auto aidl_retval =

      provider_factory_->getProviderInfo(session_type, &provider_info);

  if (!aidl_retval.isOk()) {

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

               << aidl_retval.getDescription();

  }

  return provider_info;

}



void BluetoothAudioClientInterface::SetCodecPriority(CodecId codec_id,

                                                     int32_t priority) {

  CHECK(provider_ != nullptr);

system/audio_hal_interface/aidl/client_interface_aidl.h

+3 −6
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ class BluetoothAudioClientInterface { 
  static std::vector<AudioCapabilities> GetAudioCapabilities(

      SessionType session_type);

  static std::optional<IBluetoothAudioProviderFactory::ProviderInfo>

  GetProviderInfo(

      SessionType session_type,

      std::shared_ptr<IBluetoothAudioProviderFactory> provider_factory);

  GetProviderInfo(SessionType session_type,

                  std::shared_ptr<IBluetoothAudioProviderFactory>

                      provider_factory = nullptr);



  std::optional<A2dpStatus> ParseA2dpConfiguration(

      const CodecId& codec_id, const std::vector<uint8_t>& configuration,
@@ -113,9 +113,6 @@ class BluetoothAudioClientInterface { 


  void FlushAudioData();



  std::optional<IBluetoothAudioProviderFactory::ProviderInfo> GetProviderInfo(

      SessionType session_type);



  void SetCodecPriority(CodecId codec_id, int32_t priority);



  std::vector<IBluetoothAudioProvider::LeAudioAseConfigurationSetting>