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

Commit c4f282de authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Use brackets with android_bluetooth_flags.h" into main

parents d48cd4ac c99299a5

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
 *

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



#include <android_bluetooth_flags.h>

#include <base/functional/bind.h>



#include <vector>



#include "android_bluetooth_flags.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec_int.h"

system/bta/dm/bta_dm_disc.cc

+2 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "bta/dm/bta_dm_disc.h"



#include <android_bluetooth_flags.h>

#include <base/logging.h>

#include <base/strings/stringprintf.h>

#include <stddef.h>
@@ -25,7 +26,6 @@ 
#include <cstdint>

#include <vector>



#include "android_bluetooth_flags.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_disc_int.h"

#include "bta/include/bta_gatt_api.h"

system/bta/dm/bta_dm_sec_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
 *

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



#include <android_bluetooth_flags.h>

#include <base/functional/bind.h>



#include "android_bluetooth_flags.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/bt_octets.h"

system/bta/jv/bta_jv_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 


#define LOG_TAG "bluetooth"



#include <android_bluetooth_flags.h>

#include <base/logging.h>



#include <cstdint>

#include <unordered_set>



#include "android_bluetooth_flags.h"

#include "bta/include/bta_jv_co.h"

#include "bta/include/bta_rfcomm_scn.h"

#include "bta/jv/bta_jv_int.h"

system/bta/le_audio/devices.cc

+1 −1
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 


#include "devices.h"



#include <android_bluetooth_flags.h>

#include <base/strings/string_number_conversions.h>



#include "acl_api.h"

#include "android_bluetooth_flags.h"

#include "bta_gatt_queue.h"

#include "btif/include/btif_storage.h"

#include "internal_include/bt_trace.h"