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

Commit f8f4d0ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "L2cap: Remove duplicated OnAclDisconnected invocation"

parents 01b62d81 f7ed649b

system/gd/l2cap/classic/internal/link_manager.cc

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ void LinkManager::OnDisconnect(hci::Address device, hci::ErrorCode status) { 
  auto* link = GetLink(device);

  ASSERT_LOG(link != nullptr, "Device %s is disconnected with reason 0x%x, but not in local database",

             device.ToString().c_str(), static_cast<uint8_t>(status));

  link->OnAclDisconnected(status);

  links_.erase(device);

  if (link_security_interface_listener_handler_ != nullptr) {

    link_security_interface_listener_handler_->CallOn(

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class LinkManager : public hci::acl_manager::ConnectionCallbacks { 
  Link* GetLink(hci::Address device);

  void OnConnectSuccess(std::unique_ptr<hci::acl_manager::ClassicAclConnection> acl_connection) override;

  void OnConnectFail(hci::Address device, hci::ErrorCode reason) override;

  void OnDisconnect(hci::Address device, hci::ErrorCode status);

  virtual void OnDisconnect(hci::Address device, hci::ErrorCode status);



  // FixedChannelManager methods

system/gd/l2cap/classic/internal/link_manager_test.cc

+0 −18
Original line number Diff line number Diff line
@@ -335,12 +335,6 @@ TEST_F(L2capClassicLinkManagerTest, not_acquiring_channels_should_disconnect_acl 
  EXPECT_CALL(*raw_acl_connection, Disconnect(hci::DisconnectReason::REMOTE_USER_TERMINATED_CONNECTION)).Times(1);

  std::this_thread::sleep_for(kTestIdleDisconnectTimeoutShort * 1.2);



  // Step 5: Link disconnect will trigger all callbacks

  classic_link_manager.OnDisconnect(device, hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST);

  SyncHandler(user_handler.get());

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_1);

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_2);



  user_handler->Clear();

}
@@ -417,12 +411,6 @@ TEST_F(L2capClassicLinkManagerTest, acquiring_channels_should_not_disconnect_acl 
  EXPECT_CALL(*raw_acl_connection, Disconnect(hci::DisconnectReason::REMOTE_USER_TERMINATED_CONNECTION)).Times(0);

  std::this_thread::sleep_for(kTestIdleDisconnectTimeoutShort * 2);



  // Step 5: Link disconnect will trigger all callbacks

  classic_link_manager.OnDisconnect(device, hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST);

  SyncHandler(user_handler.get());

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_1);

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_2);



  user_handler->Clear();

}
@@ -504,12 +492,6 @@ TEST_F(L2capClassicLinkManagerTest, acquiring_and_releasing_channels_should_even 
  EXPECT_CALL(*raw_acl_connection, Disconnect(hci::DisconnectReason::REMOTE_USER_TERMINATED_CONNECTION)).Times(1);

  std::this_thread::sleep_for(kTestIdleDisconnectTimeoutShort * 1.2);



  // Step 6: Link disconnect will trigger all callbacks

  classic_link_manager.OnDisconnect(device, hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST);

  SyncHandler(user_handler.get());

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_1);

  EXPECT_EQ(hci::ErrorCode::CONNECTION_TERMINATED_BY_LOCAL_HOST, status_2);



  user_handler->Clear();

}