From 5296a60e27c3328aeeca892a1160f55e1775c083 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Tue, 26 Jul 2016 15:28:12 +0100 Subject: [PATCH] APIs for ProcessBuilder.Redirect This CL is required for the following libcore change: Revert "Hide ProcessBuilder.Redirect and associated APIs." Test: Checked that 'make' succeeds. Bug: 27464570 Change-Id: I7719ab495863d3fc8cdd00fbe19ac40a37b5a6f2 --- api/current.txt | 30 ++++++++++++++++++++++++++++++ api/system-current.txt | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/api/current.txt b/api/current.txt index 9f7e642af59d4..1065cfd7a9025 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48741,11 +48741,41 @@ package java.lang { method public java.io.File directory(); method public java.lang.ProcessBuilder directory(java.io.File); method public java.util.Map environment(); + method public java.lang.ProcessBuilder inheritIO(); + method public java.lang.ProcessBuilder redirectError(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectError(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectError(); method public boolean redirectErrorStream(); method public java.lang.ProcessBuilder redirectErrorStream(boolean); + method public java.lang.ProcessBuilder redirectInput(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectInput(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectInput(); + method public java.lang.ProcessBuilder redirectOutput(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectOutput(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectOutput(); method public java.lang.Process start() throws java.io.IOException; } + public static abstract class ProcessBuilder.Redirect { + method public static java.lang.ProcessBuilder.Redirect appendTo(java.io.File); + method public java.io.File file(); + method public static java.lang.ProcessBuilder.Redirect from(java.io.File); + method public static java.lang.ProcessBuilder.Redirect to(java.io.File); + method public abstract java.lang.ProcessBuilder.Redirect.Type type(); + field public static final java.lang.ProcessBuilder.Redirect INHERIT; + field public static final java.lang.ProcessBuilder.Redirect PIPE; + } + + public static final class ProcessBuilder.Redirect.Type extends java.lang.Enum { + method public static java.lang.ProcessBuilder.Redirect.Type valueOf(java.lang.String); + method public static final java.lang.ProcessBuilder.Redirect.Type[] values(); + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type APPEND; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type INHERIT; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type PIPE; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type READ; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type WRITE; + } + public abstract interface Readable { method public abstract int read(java.nio.CharBuffer) throws java.io.IOException; } diff --git a/api/system-current.txt b/api/system-current.txt index a097edba3861f..93892a255a6c1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -51359,11 +51359,41 @@ package java.lang { method public java.io.File directory(); method public java.lang.ProcessBuilder directory(java.io.File); method public java.util.Map environment(); + method public java.lang.ProcessBuilder inheritIO(); + method public java.lang.ProcessBuilder redirectError(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectError(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectError(); method public boolean redirectErrorStream(); method public java.lang.ProcessBuilder redirectErrorStream(boolean); + method public java.lang.ProcessBuilder redirectInput(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectInput(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectInput(); + method public java.lang.ProcessBuilder redirectOutput(java.lang.ProcessBuilder.Redirect); + method public java.lang.ProcessBuilder redirectOutput(java.io.File); + method public java.lang.ProcessBuilder.Redirect redirectOutput(); method public java.lang.Process start() throws java.io.IOException; } + public static abstract class ProcessBuilder.Redirect { + method public static java.lang.ProcessBuilder.Redirect appendTo(java.io.File); + method public java.io.File file(); + method public static java.lang.ProcessBuilder.Redirect from(java.io.File); + method public static java.lang.ProcessBuilder.Redirect to(java.io.File); + method public abstract java.lang.ProcessBuilder.Redirect.Type type(); + field public static final java.lang.ProcessBuilder.Redirect INHERIT; + field public static final java.lang.ProcessBuilder.Redirect PIPE; + } + + public static final class ProcessBuilder.Redirect.Type extends java.lang.Enum { + method public static java.lang.ProcessBuilder.Redirect.Type valueOf(java.lang.String); + method public static final java.lang.ProcessBuilder.Redirect.Type[] values(); + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type APPEND; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type INHERIT; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type PIPE; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type READ; + enum_constant public static final java.lang.ProcessBuilder.Redirect.Type WRITE; + } + public abstract interface Readable { method public abstract int read(java.nio.CharBuffer) throws java.io.IOException; }