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

Commit f4e1da95 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "LeAudio: Minor header cleanup" into main am: 43209764 

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



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

system/bta/le_audio/device_groups.h

+2 −0
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 
#include <android_bluetooth_flags.h>

#include <bluetooth/log.h>



#include "common/strings.h"

#include "devices.h"

#include "le_audio_log_history.h"

#include "le_audio_types.h"



namespace bluetooth::le_audio {

system/bta/le_audio/devices.cc

+3 −0
Original line number Diff line number Diff line
@@ -24,11 +24,14 @@ 
#include "acl_api.h"

#include "bta_gatt_queue.h"

#include "btif/include/btif_storage.h"

#include "common/strings.h"

#include "hci/controller_interface.h"

#include "internal_include/bt_trace.h"

#include "le_audio_log_history.h"

#include "le_audio_utils.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "osi/include/properties.h"



using bluetooth::hci::kIsoCigPhy1M;

using bluetooth::hci::kIsoCigPhy2M;

system/bta/le_audio/devices.h

+0 −11
Original line number Diff line number Diff line
@@ -17,27 +17,16 @@ 


#pragma once



#include <map>

#include <memory>

#include <optional>

#include <tuple>

#include <utility>  // for std::pair

#include <vector>



#ifdef __ANDROID__

#include <android/sysprop/BluetoothProperties.sysprop.h>

#endif



#include "audio_hal_client/audio_hal_client.h"

#include "bta_groups.h"

#include "btm_iso_api_types.h"

#include "common/strings.h"

#include "gatt_api.h"

#include "le_audio_log_history.h"

#include "le_audio_types.h"

#include "os/log.h"

#include "osi/include/alarm.h"

#include "osi/include/properties.h"

#include "raw_address.h"



namespace bluetooth::le_audio {