commit 71a5dd533450de2ab82b6d77015485e3edf47852
author The Android Automerger <android-build@google.com> Thu Sep 11 06:13:20 2014 -0700
committer The Android Automerger <android-build@google.com> Thu Sep 11 06:13:20 2014 -0700
tree d312c37908692706e09922816bccc8a1995f84f9
parent 8806710d7a5cd6a168f2463de21498c58f70948a
parent 882ea578c6f4273ca608079025174a283ab0dd09

merge in lmp-release history after reset to 8806710d7a5cd6a168f2463de21498c58f70948a

luni/src/main/java/java/nio/SelectorImpl.java

diff --git a/luni/src/main/java/java/nio/SelectorImpl.java b/luni/src/main/java/java/nio/SelectorImpl.java
index efa8712..45406b1 100644
--- a/luni/src/main/java/java/nio/SelectorImpl.java
+++ b/luni/src/main/java/java/nio/SelectorImpl.java
@@ -39,6 +39,7 @@
 import libcore.io.Libcore;
 
 import static android.system.OsConstants.EINTR;
+import static android.system.OsConstants.POLLERR;
 import static android.system.OsConstants.POLLHUP;
 import static android.system.OsConstants.POLLIN;
 import static android.system.OsConstants.POLLOUT;
@@ -259,7 +260,7 @@
 
             int ops = key.interestOpsNoCheck();
             int selectedOps = 0;
-            if ((pollFd.revents & POLLHUP) != 0) {
+            if ((pollFd.revents & POLLHUP) != 0 || (pollFd.revents & POLLERR) != 0) {
                 // If there was an error condition, we definitely want to wake listeners,
                 // regardless of what they're waiting for. Failure is always interesting.
                 selectedOps |= ops;