| Index: runtime/bin/eventhandler_android.cc
|
| diff --git a/runtime/bin/eventhandler_android.cc b/runtime/bin/eventhandler_android.cc
|
| index 195d70d36b5db7792cf23158b8203b2ec7e84f2d..8ab91cd8a479644213983d53e49253bc0785f013 100644
|
| --- a/runtime/bin/eventhandler_android.cc
|
| +++ b/runtime/bin/eventhandler_android.cc
|
| @@ -337,13 +337,11 @@ void EventHandlerImplementation::HandleEvents(struct epoll_event* events,
|
| DescriptorInfo* di =
|
| reinterpret_cast<DescriptorInfo*>(events[i].data.ptr);
|
| const intptr_t old_mask = di->Mask();
|
| - intptr_t event_mask = GetPollEvents(events[i].events, di);
|
| + const intptr_t event_mask = GetPollEvents(events[i].events, di);
|
| if ((event_mask & (1 << kErrorEvent)) != 0) {
|
| di->NotifyAllDartPorts(event_mask);
|
| - }
|
| - event_mask &= ~(1 << kErrorEvent);
|
| -
|
| - if (event_mask != 0) {
|
| + UpdateEpollInstance(old_mask, di);
|
| + } else if (event_mask != 0) {
|
| Dart_Port port = di->NextNotifyDartPort(event_mask);
|
| ASSERT(port != 0);
|
| UpdateEpollInstance(old_mask, di);
|
|
|