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

Commit d36dbf08 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "audio_hal_interface: Rename aidl/provider_info.cc to... 

Merge "audio_hal_interface: Rename aidl/provider_info.cc to aidl/a2dp_provider_info.cc" into main am: a80b62ee

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



Change-Id: I0b81a8c73b353f9874b324796105dc1154388191
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be0b571b a80b62ee

system/audio_hal_interface/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ cc_library_static { 
            srcs: [

                "a2dp_encoding.cc",

                "aidl/a2dp_encoding_aidl.cc",

                "aidl/a2dp_provider_info.cc",

                "aidl/bluetooth_audio_port_impl.cc",

                "aidl/client_interface_aidl.cc",

                "aidl/codec_status_aidl.cc",

                "aidl/hearing_aid_software_encoding_aidl.cc",

                "aidl/hfp_client_interface_aidl.cc",

                "aidl/le_audio_software_aidl.cc",

                "aidl/provider_info.cc",

                "hal_version_manager.cc",

                "hearing_aid_software_encoding.cc",

                "hfp_client_interface.cc",

system/audio_hal_interface/aidl/a2dp_encoding_aidl.cc

+1 −1
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 


#include <vector>



#include "a2dp_provider_info.h"

#include "a2dp_transport.h"

#include "audio_aidl_interfaces.h"

#include "bta/av/bta_av_int.h"

#include "btif/include/btif_common.h"

#include "codec_status_aidl.h"

#include "provider_info.h"

#include "transport_instance.h"



namespace bluetooth {

system/audio_hal_interface/aidl/provider_info.cc→system/audio_hal_interface/aidl/a2dp_provider_info.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define LOG_TAG "AIDLProviderInfo"



#include "provider_info.h"

#include "a2dp_provider_info.h"



#include <android/binder_manager.h>

#include <android_bluetooth_flags.h>

system/audio_hal_interface/aidl/codec_status_aidl.cc

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "a2dp_vendor_ldac_constants.h"

#include "bta/av/bta_av_int.h"

#include "client_interface_aidl.h"

#include "provider_info.h"



namespace bluetooth {

namespace audio {