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

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

Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am: ac3d8580... 

Merge changes I23c831a6,I6a637b5e,I5a52498a,I69d5dff4,Ieb002c78 am: ac3d8580 am: 8ab1d103 am: 6edb8f3b

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

Change-Id: I982b5a9ee0fc1d242288eb036bd607bbf73430dc
parents ca865c7b 6edb8f3b

system/bta/dm/bta_dm_int.h

+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 


#include <memory>

#include "bt_target.h"

#include "bta_sys.h"

#include "bta/sys/bta_sys.h"



#include "bta_gatt_api.h"

#include "bta/include/bta_gatt_api.h"



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

 *  Constants and data types

system/bta/include/utl.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define UTL_H



#include "bt_types.h"

#include "bt_utils.h"

#include "utils/include/bt_utils.h"



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

 *  Constants

system/bta/sys/bta_sys_conn.cc

+4 −4
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
#include <stddef.h>



#include "bt_common.h"

#include "bta_api.h"

#include "bta_sys.h"

#include "bta_sys_int.h"

#include "bta/include/bta_api.h"

#include "bta/include/utl.h"

#include "bta/sys/bta_sys.h"

#include "bta/sys/bta_sys_int.h"

#include "osi/include/osi.h"

#include "utl.h"



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

 *

system/btif/include/btif_hd.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bluetooth.h>

#include <hardware/bt_hd.h>

#include <stdint.h>

#include "bta_hd_api.h"

#include "bta/include/bta_hd_api.h"



typedef enum {

  BTIF_HD_DISABLED = 0,

system/btif/include/btif_hh.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bt_hh.h>

#include <pthread.h>

#include <stdint.h>

#include "bta_hh_api.h"

#include "bta/include/bta_hh_api.h"

#include "btu.h"

#include "osi/include/fixed_queue.h"