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

Commit bb15a339 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove init_flags.h includes" into main am: 5ec85afb am: 078b83bb 

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



Change-Id: I897a71a9a25445d170f64921eb28406f877494c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a33b0001 078b83bb

android/app/jni/com_android_bluetooth_BluetoothQualityReport.cpp

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



#include "com_android_bluetooth.h"

#include "common/init_flags.h"

#include "hardware/bt_bqr.h"



using bluetooth::bqr::BluetoothQualityReportCallbacks;

android/app/jni/com_android_bluetooth_gatt.cpp

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


#include "com_android_bluetooth.h"

#include "com_android_bluetooth_flags.h"

#include "common/init_flags.h"

#include "hardware/bt_gatt.h"

#include "hardware/bt_gatt_types.h"

#include "main/shim/le_scanning_manager.h"

system/btif/src/bluetooth.cc

+1 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
#include "btif/include/core_callbacks.h"

#include "btif/include/stack_manager_t.h"

#include "common/address_obfuscator.h"

#include "common/init_flags.h"

#include "common/metrics.h"

#include "common/os_utils.h"

#include "device/include/device_iot_config.h"
@@ -439,7 +438,7 @@ int GetAdapterIndex() { return 0; } // Unsupported outside of FLOSS 
#endif



static int init(bt_callbacks_t* callbacks, bool start_restricted, bool is_common_criteria_mode,

                int config_compare_result, const char** init_flags, bool is_atv,

                int config_compare_result, const char** /* init_flags */, bool is_atv,

                const char* user_data_directory) {

  (void)user_data_directory;

  log::info(
@@ -447,8 +446,6 @@ static int init(bt_callbacks_t* callbacks, bool start_restricted, bool is_common 
          "result = {}",

          start_restricted, is_common_criteria_mode, config_compare_result);



  bluetooth::common::InitFlags::Load(init_flags);



  if (interface_ready()) {

    return BT_STATUS_DONE;

  }

system/gd/module_dumper.cc

+0 −13
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <sstream>



#include "common/init_flags.h"

#include "dumpsys_data_generated.h"

#include "module.h"

#include "os/wakelock_manager.h"
@@ -34,17 +33,6 @@ void ModuleDumper::DumpState(std::string* output, std::ostringstream& /*oss*/) c 
  flatbuffers::FlatBufferBuilder builder(1024);

  auto title = builder.CreateString(title_);



  common::InitFlagsDataBuilder init_flags_builder(builder);

  init_flags_builder.add_title(builder.CreateString("----- Init Flags -----"));

  std::vector<flatbuffers::Offset<common::InitFlagValue>> flags;

  for (const auto& flag : common::init_flags::dump()) {

    flags.push_back(common::CreateInitFlagValue(builder,

                                                builder.CreateString(std::string(flag.flag)),

                                                builder.CreateString(std::string(flag.value))));

  }

  init_flags_builder.add_values(builder.CreateVector(flags));

  auto init_flags_offset = init_flags_builder.Finish();



  auto wakelock_offset = WakelockManager::Get().GetDumpsysData(&builder);



  std::queue<DumpsysDataFinisher> queue;
@@ -60,7 +48,6 @@ void ModuleDumper::DumpState(std::string* output, std::ostringstream& /*oss*/) c 


  DumpsysDataBuilder data_builder(builder);

  data_builder.add_title(title);

  data_builder.add_init_flags(init_flags_offset);

  data_builder.add_wakelock_manager_data(wakelock_offset);



  while (!queue.empty()) {

system/main/shim/shim.cc

+0 −3
Original line number Diff line number Diff line
@@ -20,11 +20,8 @@ 


#include <bluetooth/log.h>



#include "common/init_flags.h"

#include "main/shim/entry.h"

#include "main/shim/hci_layer.h"

#include "main/shim/stack.h"

#include "os/log.h"

#include "stack/include/main_thread.h"



static const hci_t* hci;