diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-15 16:14:56 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-12-17 10:16:23 -0800 |
| commit | fa542091e45db699a937c5ac0191194405107827 (patch) | |
| tree | a09af98504fb8287e825fa96778d7df481eb4caa /luni/src/main/java/android | |
| parent | ae5e913146e8840b1e692f92299473268f90f415 (diff) | |
| download | libcore-fa542091e45db699a937c5ac0191194405107827.zip libcore-fa542091e45db699a937c5ac0191194405107827.tar.gz libcore-fa542091e45db699a937c5ac0191194405107827.tar.bz2 | |
Fix poll to never return EINTR.
Bug: 18759467
Change-Id: Ia5b97a55318b5990ad6b80d15641223aa4fb06f5
Diffstat (limited to 'luni/src/main/java/android')
| -rw-r--r-- | luni/src/main/java/android/system/Os.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/luni/src/main/java/android/system/Os.java b/luni/src/main/java/android/system/Os.java index 7f73a85..2626685 100644 --- a/luni/src/main/java/android/system/Os.java +++ b/luni/src/main/java/android/system/Os.java @@ -308,6 +308,10 @@ public final class Os { /** * See <a href="http://man7.org/linux/man-pages/man2/poll.2.html">poll(2)</a>. + * + * <p>Note that in Lollipop this could throw an {@code ErrnoException} with {@code EINTR}. + * In later releases, the implementation will automatically just restart the system call with + * an appropriately reduced timeout. */ public static int poll(StructPollfd[] fds, int timeoutMs) throws ErrnoException { return Libcore.os.poll(fds, timeoutMs); } |