diff options
| author | 2016-07-05 08:42:05 +0000 | |
|---|---|---|
| committer | 2016-07-05 08:42:05 +0000 | |
| commit | 326e55a3e25366b45e152ab5234b42dee781e8ac (patch) | |
| tree | 836c198eea19833768798e4ea738991261bc4e70 | |
| parent | cf5b00e6bca88e0add7e927657c8794e777f0389 (diff) | |
| parent | f0db6e8d948fe8cbd8f8afa8bfe5587efe3b613c (diff) | |
Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968"
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 69a8614600bd..adb39afcaffb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48722,11 +48722,14 @@ package java.lang { public abstract class Process { ctor public Process(); method public abstract void destroy(); + method public java.lang.Process destroyForcibly(); method public abstract int exitValue(); method public abstract java.io.InputStream getErrorStream(); method public abstract java.io.InputStream getInputStream(); method public abstract java.io.OutputStream getOutputStream(); + method public boolean isAlive(); method public abstract int waitFor() throws java.lang.InterruptedException; + method public boolean waitFor(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException; } public final class ProcessBuilder { diff --git a/api/system-current.txt b/api/system-current.txt index e67e5b101fb8..bafcfe82a8b2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -51340,11 +51340,14 @@ package java.lang { public abstract class Process { ctor public Process(); method public abstract void destroy(); + method public java.lang.Process destroyForcibly(); method public abstract int exitValue(); method public abstract java.io.InputStream getErrorStream(); method public abstract java.io.InputStream getInputStream(); method public abstract java.io.OutputStream getOutputStream(); + method public boolean isAlive(); method public abstract int waitFor() throws java.lang.InterruptedException; + method public boolean waitFor(long, java.util.concurrent.TimeUnit) throws java.lang.InterruptedException; } public final class ProcessBuilder { |