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

Commit d958178d authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge changes Ie29ff5a1,Ie573ae04 am: 267cbe79 

am: 0b95cdae

Change-Id: I74db650812e44565d697946855c50a137d2a1cb0
parents 914061ee 0b95cdae

system/gd/l2cap/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -2,14 +2,11 @@ filegroup { 
    name: "BluetoothL2capSources",

    srcs: [

        "fcs.cc",

        "classic/dynamic_channel.cc",

        "classic/dynamic_channel_manager.cc",

        "classic/dynamic_channel_service.cc",

        "classic/fixed_channel.cc",

        "classic/fixed_channel_manager.cc",

        "classic/fixed_channel_service.cc",

        "classic/internal/dynamic_channel_allocator.cc",

        "classic/internal/dynamic_channel_impl.cc",

        "classic/internal/dynamic_channel_service_manager_impl.cc",

        "classic/internal/fixed_channel_impl.cc",

        "classic/internal/fixed_channel_service_manager_impl.cc",
@@ -17,8 +14,11 @@ filegroup { 
        "classic/internal/link_manager.cc",

        "classic/internal/signalling_manager.cc",

        "classic/l2cap_classic_module.cc",

        "dynamic_channel.cc",

        "internal/basic_mode_channel_data_controller.cc",

        "internal/data_pipeline_manager.cc",

        "internal/dynamic_channel_allocator.cc",

        "internal/dynamic_channel_impl.cc",

        "internal/enhanced_retransmission_mode_channel_data_controller.cc",

        "internal/le_credit_based_channel_data_controller.cc",

        "internal/receiver.cc",
@@ -37,14 +37,14 @@ filegroup { 
filegroup {

    name: "BluetoothL2capTestSources",

    srcs: [

        "classic/internal/dynamic_channel_allocator_test.cc",

        "classic/internal/dynamic_channel_impl_test.cc",

        "classic/internal/dynamic_channel_service_manager_test.cc",

        "classic/internal/fixed_channel_impl_test.cc",

        "classic/internal/fixed_channel_service_manager_test.cc",

        "classic/internal/link_manager_test.cc",

        "classic/internal/signalling_manager_test.cc",

        "internal/basic_mode_channel_data_controller_test.cc",

        "internal/dynamic_channel_allocator_test.cc",

        "internal/dynamic_channel_impl_test.cc",

        "internal/enhanced_retransmission_mode_channel_data_controller_test.cc",

        "internal/fixed_channel_allocator_test.cc",

        "internal/le_credit_based_channel_data_controller_test.cc",
@@ -76,7 +76,7 @@ filegroup { 
filegroup {

    name: "BluetoothL2capFuzzTestSources",

    srcs: [

        "classic/internal/dynamic_channel_allocator_fuzz_test.cc",

        "internal/dynamic_channel_allocator_fuzz_test.cc",

        "l2cap_packet_fuzz_test.cc",

    ],

}

system/gd/l2cap/classic/dynamic_channel_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 


#include "hci/acl_manager.h"

#include "hci/address.h"

#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"

#include "l2cap/l2cap_packets.h"

#include "l2cap/psm.h"

#include "l2cap/security_policy.h"

system/gd/l2cap/classic/internal/dynamic_channel_service_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 


#include "common/bind.h"



#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_manager.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"



namespace bluetooth {

namespace l2cap {

system/gd/l2cap/classic/internal/dynamic_channel_service_manager_impl_mock.h

+1 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */

#pragma once



#include "l2cap/classic/internal/dynamic_channel_impl.h"

#include "l2cap/classic/internal/dynamic_channel_service_manager_impl.h"

#include "l2cap/internal/dynamic_channel_impl.h"



#include <gmock/gmock.h>

system/gd/l2cap/classic/internal/fixed_channel_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class FixedChannelImpl : public l2cap::internal::ChannelImpl { 
  virtual ~FixedChannelImpl() = default;



  hci::Address GetDevice() const {

    return device_;

    return device_.GetAddress();

  }



  virtual void RegisterOnCloseCallback(os::Handler* user_handler, FixedChannel::OnCloseCallback on_close_callback);
@@ -80,7 +80,7 @@ class FixedChannelImpl : public l2cap::internal::ChannelImpl { 
  // For logging purpose only

  const Cid cid_;

  // For logging purpose only

  const hci::Address device_;

  const hci::AddressWithType device_;

  // Needed to handle Acquire() and Release()

  Link* link_;

  os::Handler* l2cap_handler_;