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

Commit dbcea786 authored by Alex Vakulenko's avatar Alex Vakulenko
Browse files

bt: Update libchrome APIs to r369476 

The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

Change-Id: I988157d3a6e36ede6561c0fa6919bb756e8ed3dd
parent d7473e82

system/service/client/main.cpp

+3 −2
Original line number Diff line number Diff line
@@ -715,8 +715,9 @@ int main(int argc, char* argv[]) { 
      return EXIT_FAILURE;

    }



    vector<string> args;

    base::SplitString(command, ' ', &args);

    vector<string> args =

        base::SplitString(command, " ", base::TRIM_WHITESPACE,

                          base::SPLIT_WANT_ALL);



    if (args.empty())

      continue;

system/service/common/bluetooth/util/address_helper.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ bool BdAddrFromString(const std::string& address, bt_bdaddr_t* out_addr) { 
  if (address.length() != 17)

    return false;



  std::vector<std::string> byte_tokens;

  base::SplitString(address, ':', &byte_tokens);

  std::vector<std::string> byte_tokens = base::SplitString(

      address, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);



  if (byte_tokens.size() != 6)

    return false;

system/service/common/bluetooth/uuid.cpp

+3 −3
Original line number Diff line number Diff line
@@ -91,13 +91,13 @@ UUID::UUID(std::string uuid) { 
    if (uuid[23] != '-')

      return;



    std::vector<std::string> tokens;

    base::SplitString(uuid, '-', &tokens);

    std::vector<std::string> tokens = base::SplitString(

        uuid, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);



    if (tokens.size() != 5)

      return;



    uuid = JoinString(tokens, "");

    uuid = base::JoinString(tokens, "");

  }



  const int start_index = uuid.size() == 4 ? 2 : 0;

system/service/ipc/linux_ipc_host.cpp

+8 −8
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ bool LinuxIPCHost::OnAddCharacteristic(const std::string& service_uuid, 
                               const std::string& characteristic_uuid,

                               const std::string& control_uuid,

                               const std::string& options) {

  std::vector<std::string> option_tokens;

  base::SplitString(options, '.', &option_tokens);

  std::vector<std::string> option_tokens = base::SplitString(

      options, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);



  int properties_mask = 0;

  int permissions_mask = 0;
@@ -187,8 +187,8 @@ bool LinuxIPCHost::OnSetAdvertisement(const std::string& service_uuid, 
  LOG_INFO(LOG_TAG, "%s: service:%s uuids:%s data:%s", __func__, service_uuid.c_str(),

           advertise_uuids.c_str(), advertise_data.c_str());



  std::vector<std::string> advertise_uuid_tokens;

  base::SplitString(advertise_uuids, '.', &advertise_uuid_tokens);

  std::vector<std::string> advertise_uuid_tokens = base::SplitString(

      advertise_uuids, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);



  // string -> vector<UUID>

  std::vector<UUID> ids;
@@ -215,8 +215,8 @@ bool LinuxIPCHost::OnSetScanResponse(const std::string& service_uuid, 
                             const std::string& scan_response_data,

                             const std::string& manufacturer_data,

                             const std::string& transmit_name) {

  std::vector<std::string> scan_response_uuid_tokens;

  base::SplitString(scan_response_uuids, '.', &scan_response_uuid_tokens);

  std::vector<std::string> scan_response_uuid_tokens = base::SplitString(

      scan_response_uuids, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);



  // string -> vector<UUID>

  std::vector<UUID> ids;
@@ -267,8 +267,8 @@ bool LinuxIPCHost::OnMessage() { 
    return false;

  }



  std::vector<std::string> tokens;

  base::SplitString(ipc_msg, '|', &tokens);

  std::vector<std::string> tokens = base::SplitString(

      ipc_msg, "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);

  switch (tokens.size()) {

    case 2:

      if (tokens[0] == kSetAdapterNameCommand)

system/service/test/ipc_linux_unittest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -134,13 +134,13 @@ class TestDelegate : public ipc::IPCManager::Delegate, 
  void OnIPCHandlerStarted(ipc::IPCManager::Type type) override {

    ASSERT_EQ(ipc::IPCManager::TYPE_LINUX, type);

    started_count_++;

    base::MessageLoop::current()->Quit();

    base::MessageLoop::current()->QuitWhenIdle();

  }



  void OnIPCHandlerStopped(ipc::IPCManager::Type type) override {

    ASSERT_EQ(ipc::IPCManager::TYPE_LINUX, type);

    stopped_count_++;

    base::MessageLoop::current()->Quit();

    base::MessageLoop::current()->QuitWhenIdle();

  }



  int started_count() const { return started_count_; }