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

Commit 29c51387 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7026150 from 07cb9d3c to sc-release 

Change-Id: I83b8ba5c68757c31c3b208344e1f1961731b192b
parents 8d9867fb 07cb9d3c

system/btif/src/stack_manager.cc

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static void event_shut_down_stack(UNUSED_ATTR void* context) { 
  gatt_free();

  l2c_free();

  sdp_free();

  btm_ble_free();

  btm_free();



  if (bluetooth::shim::is_any_gd_enabled()) {

system/gd/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ cc_test { 
        "libbluetooth_rust_interop",

        "libbt_shim_ffi",

        "libcxxbridge05",

        "libchrome",

    ],

}
@@ -485,6 +486,12 @@ rust_library { 
    srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],

    edition: "2018",

    host_supported: true,

    proc_macros: ["libnum_derive"],

    rustlibs: [

        "libbytes",

        "libnum_traits",

        "libthiserror",

    ],

}



// Generates binary schema data to be bundled and source file generated

system/gd/hci/acl_manager_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ TEST_F(AclManagerWithConnectionTest, send_read_transmit_power_level) { 
  auto packet = test_hci_layer_->GetCommandPacket(OpCode::READ_TRANSMIT_POWER_LEVEL);

  auto command_view = ReadTransmitPowerLevelView::Create(packet);

  ASSERT_TRUE(command_view.IsValid());

  ASSERT_EQ(command_view.GetType(), TransmitPowerLevelType::CURRENT);

  ASSERT_EQ(command_view.GetTransmitPowerLevelType(), TransmitPowerLevelType::CURRENT);



  EXPECT_CALL(mock_connection_management_callbacks_, OnReadTransmitPowerLevelComplete(0x07));

  uint8_t num_packets = 1;

system/gd/hci/facade/acl_manager_facade.cc

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect 
      case OpCode::READ_TRANSMIT_POWER_LEVEL: {

        auto view = ReadTransmitPowerLevelView::Create(command_view);

        GET_CONNECTION(view);

        connection->second.connection_->ReadTransmitPowerLevel(view.GetType());

        connection->second.connection_->ReadTransmitPowerLevel(view.GetTransmitPowerLevelType());

        return ::grpc::Status::OK;

      }

      case OpCode::READ_LINK_SUPERVISION_TIMEOUT: {

system/gd/hci/hci_packets.pdl

+3 −3
Original line number Diff line number Diff line
@@ -1753,7 +1753,7 @@ enum TransmitPowerLevelType : 8 { 
packet ReadTransmitPowerLevel : ConnectionManagementCommand (op_code = READ_TRANSMIT_POWER_LEVEL) {

  connection_handle : 12,

  _reserved_ : 4,

  type : TransmitPowerLevelType,

  transmit_power_level_type : TransmitPowerLevelType,



}
@@ -2487,7 +2487,7 @@ enum OwnAddressType : 8 { 
packet LeSetAdvertisingParameters : LeAdvertisingCommand (op_code = LE_SET_ADVERTISING_PARAMETERS) {

  interval_min : 16,

  interval_max : 16,

  type : AdvertisingType,

  advt_type : AdvertisingType,

  own_address_type : OwnAddressType,

  peer_address_type : PeerAddressType,

  peer_address : Address,
@@ -3751,7 +3751,7 @@ packet LeMultiAdvtComplete : CommandComplete (command_op_code = LE_MULTI_ADVT) { 
packet LeMultiAdvtParam : LeMultiAdvt (sub_cmd = SET_PARAM) {

  interval_min : 16,

  interval_max : 16,

  type : AdvertisingType,

  advt_type : AdvertisingType,

  own_address_type : OwnAddressType,

  peer_address_type : PeerAddressType,

  peer_address : Address,