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

Commit 325e3672 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I89fe9190,I7e8b9373,Ic4f9cc3a am: e0f201f4 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1805903

Change-Id: Iaf7730127ea49e3d17b7e002594921c699e7700b
parents 04a511f9 e0f201f4

system/btif/src/bluetooth.cc

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

#include "btif_metrics_logging.h"

#include "btif_storage.h"

#include "btsnoop.h"

#include "btsnoop_mem.h"

#include "common/address_obfuscator.h"

#include "common/metric_id_allocator.h"

system/hci/src/buffer_allocator.cc

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <base/logging.h>



#include "bt_common.h"

#include "buffer_allocator.h"

#include "check.h"

#include "hci/include/buffer_allocator.h"



static void* buffer_alloc(size_t size) {

  CHECK(size <= BT_DEFAULT_BUFFER_SIZE);

system/hci/src/hci_packet_factory.cc

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <base/logging.h>



#include "bt_types.h"

#include "buffer_allocator.h"

#include "check.h"

#include "hci/include/buffer_allocator.h"

#include "hci_internals.h"

#include "hci_layer.h"

#include "hci_packet_factory.h"

system/hci/src/hci_packet_parser.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


#include <base/logging.h>



#include "buffer_allocator.h"

#include "check.h"

#include "hci/include/buffer_allocator.h"

#include "hci_layer.h"

#include "hcimsgs.h"

#include "osi/include/log.h"

system/hci/src/packet_fragmenter.cc

+1 −1
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
#include <unordered_map>



#include "bt_target.h"

#include "buffer_allocator.h"

#include "check.h"

#include "device/include/controller.h"

#include "hci/include/buffer_allocator.h"

#include "hci_internals.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"