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

Commit 63a50fd7 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes I17cfac83,I0c744366,I1ed61b82,Ia8e80b05 into main 

* changes:
  system/audio_hal_interface: Fix -Wmissing-prototypes errors
  system/btif/src: Fix -Wmissing-prototypes errors
  system/stack/avdt: Fix -Wmissing-prototypes errors
  system/bta/av: Fix -Wmissing-prototypes errors
parents b8084edf 7802b148

system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc

+2 −5
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ 
#include "provider_info.h"

#include "types/raw_address.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



namespace bluetooth {

namespace audio {

namespace aidl {
@@ -49,7 +46,7 @@ std::map<bt_status_t, BluetoothAudioCtrlAck> status_to_ack_map = { 
        {BT_STATUS_UNSUPPORTED, BluetoothAudioCtrlAck::FAILURE_UNSUPPORTED},

};



std::string command_to_text(tHFP_CTRL_CMD cmd) {

static std::string command_to_text(tHFP_CTRL_CMD cmd) {

  switch (cmd) {

    case HFP_CTRL_CMD_NONE:

      return "none";
@@ -74,7 +71,7 @@ std::string command_to_text(tHFP_CTRL_CMD cmd) { 
  }

}



tBTA_AG_SCB* get_hfp_active_device_callback() {

static tBTA_AG_SCB* get_hfp_active_device_callback() {

  const RawAddress& addr = bta_ag_get_active_device();

  if (addr.IsEmpty()) {

    log::error("No active device found");

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+2 −5
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
#include "hal_version_manager.h"

#include "os/log.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



namespace bluetooth {

namespace audio {

namespace aidl {
@@ -587,7 +584,7 @@ bool hal_ucast_capability_to_stack_format(const UnicastCapability& hal_capabilit 
  return true;

}



bool hal_bcast_capability_to_stack_format(const BroadcastCapability& hal_bcast_capability,

static bool hal_bcast_capability_to_stack_format(const BroadcastCapability& hal_bcast_capability,

                                                 CodecConfigSetting& stack_capability) {

  if (hal_bcast_capability.codecType != CodecType::LC3) {

    log::warn("Unsupported codecType: {}", toString(hal_bcast_capability.codecType));

system/audio_hal_interface/aidl/le_audio_utils.cc

+6 −8
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 


#include "hardware/bt_le_audio.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



namespace bluetooth {

namespace audio {

namespace aidl {
@@ -81,7 +78,7 @@ namespace aidl { 
  return codec;

}



std::vector<::aidl::android::hardware::bluetooth::audio::CodecSpecificCapabilitiesLtv>

static std::vector<::aidl::android::hardware::bluetooth::audio::CodecSpecificCapabilitiesLtv>

GetAidlCodecCapabilitiesFromStack(const ::bluetooth::le_audio::types::LeAudioLtvMap& in) {

  std::vector<::aidl::android::hardware::bluetooth::audio::CodecSpecificCapabilitiesLtv> ltvs;

  auto stack_caps = in.GetAsCoreCodecCapabilities();
@@ -409,7 +406,7 @@ GetStackBroadcastConfigurationFromAidlFormat( 
  return std::move(cfg);

}



::bluetooth::le_audio::set_configurations::QosConfigSetting GetStackQosConfigSettingFromAidl(

static ::bluetooth::le_audio::set_configurations::QosConfigSetting GetStackQosConfigSettingFromAidl(

        const std::optional<::aidl::android::hardware::bluetooth::audio::IBluetoothAudioProvider::

                                    LeAudioAseQosConfiguration>& aidl_qos,

        ::aidl::android::hardware::bluetooth::audio::LeAudioAseConfiguration::TargetLatency
@@ -426,7 +423,7 @@ GetStackBroadcastConfigurationFromAidlFormat( 
  return config;

}



::bluetooth::le_audio::set_configurations::CodecConfigSetting GetCodecConfigSettingFromAidl(

static ::bluetooth::le_audio::set_configurations::CodecConfigSetting GetCodecConfigSettingFromAidl(

        const std::optional<::aidl::android::hardware::bluetooth::audio::LeAudioAseConfiguration>&

                ase_config) {

  auto stack_config = ::bluetooth::le_audio::set_configurations::CodecConfigSetting();
@@ -496,7 +493,7 @@ GetStackBroadcastConfigurationFromAidlFormat( 


// The number of source entries is the total count of ASEs within the group to

// be configured

::bluetooth::le_audio::set_configurations::AseConfiguration GetStackAseConfigurationFromAidl(

static ::bluetooth::le_audio::set_configurations::AseConfiguration GetStackAseConfigurationFromAidl(

        const ::aidl::android::hardware::bluetooth::audio::IBluetoothAudioProvider::

                LeAudioAseConfigurationSetting::AseDirectionConfiguration& source) {

  auto stack_qos = GetStackQosConfigSettingFromAidl(source.qosConfiguration,
@@ -510,7 +507,8 @@ GetStackBroadcastConfigurationFromAidlFormat( 
  return config;

}



::bluetooth::le_audio::set_configurations::AudioSetConfiguration GetStackConfigSettingFromAidl(

static ::bluetooth::le_audio::set_configurations::AudioSetConfiguration

GetStackConfigSettingFromAidl(

        ::bluetooth::le_audio::types::LeAudioContextType ctx_type,

        const ::aidl::android::hardware::bluetooth::audio::IBluetoothAudioProvider::

                LeAudioAseConfigurationSetting& aidl_ase_config) {

system/audio_hal_interface/aidl/provider_info.cc

+1 −4
Original line number Diff line number Diff line
@@ -25,15 +25,12 @@ 


#include "client_interface_aidl.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



namespace bluetooth::audio::aidl {

using ::aidl::android::hardware::bluetooth::audio::CodecId;

using ::aidl::android::hardware::bluetooth::audio::CodecInfo;

using ::aidl::android::hardware::bluetooth::audio::SessionType;



::hfp::sco_config recordHfpCodecInfo(CodecInfo codecInfo) {

static ::hfp::sco_config recordHfpCodecInfo(CodecInfo codecInfo) {

  auto hfp_transport = codecInfo.transport.get<CodecInfo::Transport::hfp>();

  ::hfp::sco_config config{

          .inputDataPath = hfp_transport.inputDataPath,

system/audio_hal_interface/hal_version_manager.cc

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
#include "aidl/audio_aidl_interfaces.h"

#include "os/log.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



namespace bluetooth {

namespace audio {