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

Commit 75cb635b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Fix errors found with clang ToT" am: 154250d3 

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



Change-Id: Ia896e8d225aa26507cab8f5b8315b0c15d50d40e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 418bdaaf 154250d3

system/gd/common/strings.cc

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


#include "common/strings.h"



#include <algorithm>

#include <charconv>

#include <cstdlib>

#include <functional>

system/gd/hci/hci_layer.h

+6 −2
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ 
#pragma once



#include <chrono>

#include <list>

#include <map>

#include <memory>

#include <string>

#include <utility>



#include "address.h"

#include "class_of_device.h"
@@ -136,12 +140,12 @@ class HciLayer : public Module, public CommandInterface<CommandBuilder> { 


    void EnqueueCommand(std::unique_ptr<T> command,

                        common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {

      hci_.EnqueueCommand(move(command), std::move(on_complete));

      hci_.EnqueueCommand(std::move(command), std::move(on_complete));

    }



    void EnqueueCommand(std::unique_ptr<T> command,

                        common::ContextualOnceCallback<void(CommandStatusView)> on_status) override {

      hci_.EnqueueCommand(move(command), std::move(on_status));

      hci_.EnqueueCommand(std::move(command), std::move(on_status));

    }

    HciLayer& hci_;

  };

system/gd/module.h

+2 −0
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
#pragma once



#include <flatbuffers/flatbuffers.h>

#include <chrono>

#include <functional>

#include <future>

#include <map>

#include <string>

#include <utility>

#include <vector>



#include "common/bind.h"