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

Commit 1919fbc7 authored by John Bates's avatar John Bates Committed by android-build-merger
Browse files

Merge "Rearm pdx fd on errors" into pi-dev

am: 17ea0116

Change-Id: I50144124d1312a0ca505882a61a06e10b49c6d6d
parents 9e0ee22f 17ea0116
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -594,9 +594,10 @@ Status<void> Endpoint::MessageReceive(Message* message) {

  if (socket_fd_ && event.data.fd == socket_fd_.Get()) {
    auto status = AcceptConnection(message);
    if (!status)
    auto reenable_status = ReenableEpollEvent(socket_fd_.Borrow());
    if (!reenable_status)
      return reenable_status;
    return status;
    return ReenableEpollEvent(socket_fd_.Borrow());
  }

  BorrowedHandle channel_fd{event.data.fd};