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

Commit 7ade838d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Re-include files that use l2cap psm constants am: 805d0fdd 

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



Change-Id: If6fad9aabbf37dc5bb99f4d84f7d124b1c396080
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59c35f0b 805d0fdd

system/bta/jv/bta_jv_act.cc

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include "types/raw_address.h"



using namespace bluetooth::legacy::stack::sdp;

using bluetooth::Uuid;



tBTA_JV_CB bta_jv_cb;

std::unordered_set<uint16_t> used_l2cap_classic_dynamic_psm;

system/osi/src/stack_power_telemetry.cc

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

#include "stack/btm/btm_dev.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/bt_types.h"

#include "types/raw_address.h"



time_t get_current_time() { return time(0); }

system/stack/acl/btm_pm.cc

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 
#include "bt_target.h"

#include "device/include/controller.h"

#include "device/include/interop.h"

#include "gd/common/init_flags.h"

#include "main/shim/dumpsys.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"

#include "os/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_int_types.h"

system/stack/bnep/bnep_api.cc

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

#include "bta/include/bta_api.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "types/bluetooth/uuid.h"

system/stack/bnep/bnep_main.cc

+1 −2
Original line number Diff line number Diff line
@@ -31,12 +31,11 @@ 
#include "bnep_int.h"

#include "bt_target.h"

#include "bta/include/bta_api.h"

#include "btm_api.h"

#include "device/include/controller.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"