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

Commit 5bb1b87c authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge changes Id7d7ba64,Ic652286a into main 

* changes:
  [Invisalign2] clean up acl_api.h with iwyu
  [Invisalign2] clean up btm_sec.cc
parents 0afe7a06 658cb54d

system/bta/hearing_aid/hearing_aid.cc

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "device/include/controller.h"

#include "embdrv/g722/g722_enc_dec.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"        // BTM_ReadRSSI

system/btif/src/btif_dm.cc

+5 −4
Original line number Diff line number Diff line
@@ -75,14 +75,15 @@ 
#include "osi/include/properties.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_dev.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_ble_sec_api_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api_types.h"

#include "stack/include/bt_octets.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_ble_sec_api_types.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/sdp/sdpint.h"

#include "stack_config.h"

#include "types/raw_address.h"

system/btif/src/btif_gatt_client.cc

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

#include "device/include/controller.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_api_types.h"

#include "stack/include/main_thread.h"

system/osi/src/stack_power_telemetry.cc

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


#include "osi/include/properties.h"

#include "stack/btm/btm_dev.h"

#include "stack/include/acl_api_types.h"

#include "stack/include/bt_psm_types.h"

#include "types/raw_address.h"

system/stack/acl/acl.h

+0 −2
Original line number Diff line number Diff line
@@ -316,8 +316,6 @@ struct tACL_CONN { 
  void Reset();

};



struct controller_t;



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

 **      ACL Management API

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