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

Commit 1ff6591a authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L45200000958350315:N48800001332110545"... 

Merge changes from topic "cherrypicker-L45200000958350315:N48800001332110545" into tm-qpr-dev am: f1b2021f

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



Change-Id: Ibc4f5c3ffd6c42a7ffd264c83067f17ec3744f62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 452d4696 f1b2021f

system/gd/hci/hci_layer_unittest.cc

+8 −4
Original line number Diff line number Diff line
@@ -168,11 +168,13 @@ class HciLayerTest : public ::testing::Test { 


TEST_F(HciLayerTest, setup_teardown) {}



TEST_F(HciLayerTest, reset_command_sent_on_start) {

// b/260915548

TEST_F(HciLayerTest, DISABLED_reset_command_sent_on_start) {

  FailIfResetNotSent();

}



TEST_F(HciLayerTest, controller_debug_info_requested_on_hci_timeout) {

// b/260915548

TEST_F(HciLayerTest, DISABLED_controller_debug_info_requested_on_hci_timeout) {

  FailIfResetNotSent();

  FakeTimerAdvance(HciLayer::kHciTimeoutMs.count());
@@ -183,7 +185,8 @@ TEST_F(HciLayerTest, controller_debug_info_requested_on_hci_timeout) { 
  ASSERT_TRUE(debug_info_view.IsValid());

}



TEST_F(HciLayerTest, abort_after_hci_restart_timeout) {

// b/260915548

TEST_F(HciLayerTest, DISABLED_abort_after_hci_restart_timeout) {

  FailIfResetNotSent();

  FakeTimerAdvance(HciLayer::kHciTimeoutMs.count());
@@ -202,7 +205,8 @@ TEST_F(HciLayerTest, abort_after_hci_restart_timeout) { 
      "");

}



TEST_F(HciLayerTest, abort_on_root_inflammation_event) {

// b/260915548

TEST_F(HciLayerTest, DISABLED_abort_on_root_inflammation_event) {

  FailIfResetNotSent();



  auto payload = CreatePayload({'0'});