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

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

Merge changes I07896917,Ib11b519f,Ie2e8b226 am: cfb80e43 

Change-Id: Ib1f067263ddd1796d27af9a18ddf39d0a207c37f
parents b7f7ddb3 cfb80e43

system/gd/hci/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ filegroup { 
        "acl_manager/acl_connection.cc",

        "acl_manager/classic_acl_connection.cc",

        "acl_manager/le_acl_connection.cc",

        "acl_manager/round_robin_scheduler.cc",

        "acl_manager/acl_fragmenter.cc",

        "acl_manager.cc",

        "acl_fragmenter.cc",

        "address.cc",

        "class_of_device.cc",

        "controller.cc",
@@ -14,7 +15,6 @@ filegroup { 
        "hci_layer.cc",

        "le_advertising_manager.cc",

        "le_scanning_manager.cc",

        "round_robin_scheduler.cc",

    ],

}
@@ -22,6 +22,7 @@ filegroup { 
    name: "BluetoothHciTestSources",

    srcs: [

        "acl_builder_test.cc",

        "acl_manager/round_robin_scheduler_test.cc",

        "acl_manager_test.cc",

        "address_unittest.cc",

        "address_with_type_test.cc",
@@ -34,7 +35,6 @@ filegroup { 
        "hci_packets_test.cc",

        "le_advertising_manager_test.cc",

        "le_scanning_manager_test.cc",

        "round_robin_scheduler_test.cc",

    ],

}

system/gd/hci/acl_manager.cc

+36 −830

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/acl_manager.h

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,8 @@ 


#include "common/bidi_queue.h"

#include "common/callback.h"

#include "hci/acl_manager/classic_acl_connection.h"

#include "hci/acl_manager/connection_callbacks.h"

#include "hci/acl_manager/connection_management_callbacks.h"

#include "hci/acl_manager/le_acl_connection.h"

#include "hci/acl_manager/le_connection_callbacks.h"

#include "hci/acl_manager/le_connection_management_callbacks.h"

#include "hci/address.h"

#include "hci/address_with_type.h"

#include "hci/hci_layer.h"
@@ -92,8 +88,6 @@ class AclManager : public Module { 
  struct impl;

  std::unique_ptr<impl> pimpl_;



  struct acl_connection;

  struct le_acl_connection;

  DISALLOW_COPY_AND_ASSIGN(AclManager);

};

system/gd/hci/acl_fragmenter.cc→system/gd/hci/acl_manager/acl_fragmenter.cc

+3 −1
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ 
 * limitations under the License.

 */



#include "hci/acl_fragmenter.h"

#include "hci/acl_manager/acl_fragmenter.h"



#include "os/log.h"

#include "packet/fragmenting_inserter.h"



namespace bluetooth {

namespace hci {

namespace acl_manager {



AclFragmenter::AclFragmenter(size_t mtu, std::unique_ptr<packet::BasePacketBuilder> packet)

    : mtu_(mtu), packet_(std::move(packet)) {}
@@ -33,5 +34,6 @@ std::vector<std::unique_ptr<packet::RawBuilder>> AclFragmenter::GetFragments() { 
  return to_return;

}



}  // namespace acl_manager

}  // namespace hci

}  // namespace bluetooth

system/gd/hci/acl_fragmenter.h→system/gd/hci/acl_manager/acl_fragmenter.h

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


namespace bluetooth {

namespace hci {

namespace acl_manager {



class AclFragmenter {

 public:
@@ -40,5 +41,6 @@ class AclFragmenter { 
  std::unique_ptr<packet::BasePacketBuilder> packet_;

};



}  // namespace acl_manager

}  // namespace hci

}  // namespace bluetooth