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

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

IA2: Break out l2cap psm constants into own file am: 80205b6d 

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



Change-Id: I1b01c289b546fb56b6e30cba4f6d2411fe31af21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 987f5933 80205b6d

system/bta/jv/bta_jv_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "stack/include/avct_api.h"  // AVCT_PSM

#include "stack/include/avdt_api.h"  // AVDT_PSM

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/gap_api.h"

#include "stack/include/l2cdefs.h"

#include "stack/include/port_api.h"

system/osi/src/stack_power_telemetry.cc

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#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"

system/stack/bnep/bnep_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "bnep_api.h"



#include <base/logging.h>

#include <string.h>



#include "bnep_int.h"
@@ -31,11 +32,10 @@ 
#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"

#include "types/raw_address.h"



#include <base/logging.h>



using bluetooth::Uuid;



/*******************************************************************************

system/stack/bnep/bnep_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#define LOG_TAG "bluetooth"



#include <base/logging.h>

#include <string.h>



#include "bnep_api.h"
@@ -38,10 +39,9 @@ 
#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_psm_types.h"

#include "types/raw_address.h"



#include <base/logging.h>



/******************************************************************************/

/*                     G L O B A L    B N E P       D A T A                   */

/******************************************************************************/

system/stack/btm/btm_sec.cc

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "stack/btm/security_device_record.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/bt_psm_types.h"

#include "stack/include/btm_status.h"

#include "stack/include/btu.h"  // do_in_main_thread

#include "stack/include/l2cap_security_interface.h"