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

Commit 8a3bbd21 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ib4dc4d34,I20913bd1 into main am: aacb4fc5 

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



Change-Id: If42c8019db5a86db1499e4f6225275f51dc85fe2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12db6391 aacb4fc5

system/stack/rfcomm/port_api.cc

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


#include <cstdint>



#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/mutex.h"

system/stack/rfcomm/port_int.h

+1 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 


#include <cstdint>



#include "internal_include/bt_target.h"

#include "osi/include/alarm.h"

#include "osi/include/fixed_queue.h"

#include "stack/include/l2c_api.h"

#include "stack/include/port_api.h"

#include "stack/include/rfcdefs.h"

#include "types/raw_address.h"



/*

 * Flow control configuration values for the mux

*/

system/stack/rfcomm/port_rfc.cc

+2 −2
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
#include <cstdint>

#include <string>



#include "bt_target.h"

#include "gd/hal/snoop_logger.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/mutex.h"

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

#include "stack/include/bt_hdr.h"

system/stack/rfcomm/port_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 
#include <cstdint>

#include <cstring>



#include "bt_target.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/mutex.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_client_interface.h"

system/stack/rfcomm/rfc_l2cap_if.cc

+2 −1
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ 
#include <cstddef>

#include <cstdint>



#include "bt_target.h"

#include "common/time_util.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/log.h"

#include "osi/include/allocator.h"

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