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

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

Re-include bta/dm/bta_dm_act am: 8d38c9ea am: 199717ef am: 91628f70 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f4c6f45606bcc66afb93fa8f8d71a9bb371a45f
parents 6d3473db 91628f70

system/bta/dm/bta_dm_act.cc

+12 −26
Original line number Diff line number Diff line
@@ -25,40 +25,26 @@ 


#define LOG_TAG "bt_bta_dm"



#include <base/bind.h>

#include <base/callback.h>

#include <base/logging.h>

#include <string.h>



#include "bt_common.h"

#include "bt_target.h"

#include "bt_types.h"

#include "bta_api.h"

#include "bta_dm_api.h"

#include "bta_dm_ci.h"

#include "bta_dm_co.h"

#include "bta_dm_int.h"

#include "bta_sys.h"

#include "btif_dm.h"

#include "btif_storage.h"

#include "btm_api.h"

#include "btm_int.h"

#include "btu.h"

#include <cstdint>



#include "bta/dm/bta_dm_int.h"

#include "bta/gatt/bta_gattc_int.h"

#include "bta/include/bta_dm_ci.h"

#include "btif/include/btif_dm.h"

#include "btif/include/btif_storage.h"

#include "btif/include/stack_manager.h"

#include "device/include/controller.h"

#include "device/include/interop.h"

#include "gap_api.h" /* For GAP_BleReadPeerPrefConnParams */

#include "l2c_api.h"

#include "main/shim/btm_api.h"

#include "main/shim/shim.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "sdp_api.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/neighbor_inquiry.h"

#include "stack/gatt/connection_manager.h"

#include "stack/include/acl_api.h"

#include "stack/include/gatt_api.h"

#include "stack_manager.h"

#include "utl.h"

#include "stack/include/bt_types.h"

#include "stack/include/btu.h"

#include "types/raw_address.h"



#if (GAP_INCLUDED == TRUE)

#include "gap_api.h"