summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-04-11 17:29:54 +0100
committerNeil Fuller <nfuller@google.com>2014-04-23 16:40:35 +0000
commit43582df3dbcad1b1734b570c74246f5ff2f58027 (patch)
tree4ecd554e097e3e22dbade9123528628dd595c9d9 /services
parent53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330 (diff)
downloadframeworks_base-43582df3dbcad1b1734b570c74246f5ff2f58027.zip
frameworks_base-43582df3dbcad1b1734b570c74246f5ff2f58027.tar.gz
frameworks_base-43582df3dbcad1b1734b570c74246f5ff2f58027.tar.bz2
Changes to support asynchronous close interruption
This change contains fixes to base from libcore change I37de3e7d1a005a73821221e6156d10b95c595d7a Bug: 13927110 Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/am/NativeCrashListener.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/NativeCrashListener.java b/services/java/com/android/server/am/NativeCrashListener.java
index 2c7f1f1..1dba23c 100644
--- a/services/java/com/android/server/am/NativeCrashListener.java
+++ b/services/java/com/android/server/am/NativeCrashListener.java
@@ -29,6 +29,7 @@ import static libcore.io.OsConstants.*;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileDescriptor;
+import java.io.InterruptedIOException;
import java.net.InetSocketAddress;
import java.net.InetUnixAddress;
@@ -178,7 +179,7 @@ final class NativeCrashListener extends Thread {
}
static int readExactly(FileDescriptor fd, byte[] buffer, int offset, int numBytes)
- throws ErrnoException {
+ throws ErrnoException, InterruptedIOException {
int totalRead = 0;
while (numBytes > 0) {
int n = Libcore.os.read(fd, buffer, offset + totalRead, numBytes);