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

Commit b900363e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix broken BufferHubQueueTest.TestRemoveBuffer" into pi-dev

parents 2afd5172 fe924f35

libs/vr/libbufferhub/buffer_hub-test.cpp

+6 −1
Original line number Diff line number Diff line
@@ -769,9 +769,14 @@ TEST_F(LibBufferHubTest, TestDetachBufferFromProducer) { 


  auto s3 = p->CreateConsumer();

  EXPECT_FALSE(s3);

  // Note that here the expected error code is EOPNOTSUPP as the socket towards

  // ProducerChannel has been teared down.

  EXPECT_EQ(s3.error(), EOPNOTSUPP);



  s3 = c->CreateConsumer();

  EXPECT_FALSE(s3);

  EXPECT_EQ(s3.error(), EOPNOTSUPP);

  // Note that here the expected error code is EPIPE returned from

  // ConsumerChannel::HandleMessage as the socket is still open but the producer

  // is gone.

  EXPECT_EQ(s3.error(), EPIPE);

}

services/vr/bufferhubd/producer_channel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ ProducerChannel::~ProducerChannel() { 
           channel_id(), buffer_id(), buffer_state_->load());

  for (auto consumer : consumer_channels_) {

    consumer->OnProducerClosed();

    service()->SetChannel(consumer->channel_id(), nullptr);

  }

  Hangup();

}