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

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

Merge "legacy: Include bta/dm/bta_dm_act.cc::stack/btm/btm_ble_int.h" am: e3ea7c08 

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

Change-Id: Ice5d661f29b7ecc4af16cbbcd8ab8a4bdf9582d4
parents 736823f7 e3ea7c08

system/bta/dm/bta_dm_act.cc

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


#define LOG_TAG "bt_bta_dm"



#include <base/logging.h>



#include <cstdint>



#include "bta/dm/bta_dm_int.h"
@@ -44,6 +46,7 @@ 
#include "osi/include/fixed_queue.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/neighbor_inquiry.h"

#include "stack/gatt/connection_manager.h"
@@ -56,8 +59,6 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



#include <base/logging.h>



#if (GAP_INCLUDED == TRUE)

#include "gap_api.h"

#endif