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

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

Merge "InitFlags: Remove unused includes" into main

parents 92e987dd d69fb05e

system/bta/ag/bta_ag_sdp.cc

+0 −2
Original line number Diff line number Diff line
@@ -31,11 +31,9 @@ 
#include "bta/include/bta_hfp_api.h"

#include "bta/include/bta_rfcomm_scn.h"

#include "btif/include/btif_config.h"

#include "common/init_flags.h"

#include "device/include/interop.h"

#include "device/include/interop_config.h"

#include "internal_include/bt_target.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_sco_hfp_hal.h"

#include "stack/include/bt_types.h"

system/bta/csis/csis_types.h

+1 −5
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include "bta_gatt_api.h"

#include "bta_groups.h"

#include "btif/include/btif_storage.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "gap_api.h"
@@ -437,9 +435,7 @@ public: 
      auto inst2 = dev2->GetCsisInstanceByGroupId(id);

      if (!inst1 || !inst2) {

        /* One of the device is not connected */

        log::debug("Device  {} is not connected.", inst1 == nullptr

                                                           ? ADDRESS_TO_LOGGABLE_CSTR(dev1->addr)

                                                           : ADDRESS_TO_LOGGABLE_CSTR(dev2->addr));

        log::debug("Device  {} is not connected.", inst1 == nullptr ? dev1->addr : dev2->addr);

        return dev1->IsConnected();

      }

      return inst1->GetRank() < inst2->GetRank();

system/bta/gatt/bta_gattc_utils.cc

+0 −2
Original line number Diff line number Diff line
@@ -29,12 +29,10 @@ 
#include <cstdint>



#include "bta/gatt/bta_gattc_int.h"

#include "common/init_flags.h"

#include "hci/controller_interface.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "types/bt_transport.h"

#include "types/hci_role.h"

system/bta/sdp/bta_sdp_act.cc

+0 −4
Original line number Diff line number Diff line
@@ -31,11 +31,7 @@ 
#include "bta/sdp/bta_sdp_int.h"

#include "btif/include/btif_profile_storage.h"

#include "btif/include/btif_sock_sdp.h"

#include "common/init_flags.h"

#include "main/shim/metrics_api.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/sdp_api.h"

#include "stack/include/sdpdefs.h"

system/bta/test/bta_api_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <utility>

#include <vector>



#include "common/init_flags.h"

#include "test/common/mock_functions.h"



using namespace std::chrono_literals;