Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d382e4be authored by Doug Zongker's avatar Doug Zongker Committed by Android (Google) Code Review
Browse files

Merge "@hide the bizarro Base64 stream constructors"

parents 6f8a3dfa 33f7a80f

api/current.xml

+0 −28
Original line number Diff line number Diff line
@@ -163739,20 +163739,6 @@ 
<parameter name="flags" type="int">

</parameter>

</constructor>

<constructor name="Base64InputStream"

 type="android.util.base64.Base64InputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="in" type="java.io.InputStream">

</parameter>

<parameter name="flags" type="int">

</parameter>

<parameter name="encode" type="boolean">

</parameter>

</constructor>

</class>

<class name="Base64OutputStream"

 extends="java.io.FilterOutputStream"
@@ -163774,20 +163760,6 @@ 
<parameter name="flags" type="int">

</parameter>

</constructor>

<constructor name="Base64OutputStream"

 type="android.util.base64.Base64OutputStream"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="out" type="java.io.OutputStream">

</parameter>

<parameter name="flags" type="int">

</parameter>

<parameter name="encode" type="boolean">

</parameter>

</constructor>

</class>

</package>

<package name="android.view"

core/java/android/util/base64/Base64InputStream.java

+4 −3
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ import java.io.IOException; 
import java.io.InputStream;



/**

 * An OutputStream that does either Base64 encoding or decoding on the

 * data written to it, writing the resulting data to another

 * OutputStream.

 * An InputStream that does Base64 decoding on the data read through

 * it.

 */

public class Base64InputStream extends FilterInputStream {

    private final boolean encode;
@@ -59,6 +58,8 @@ public class Base64InputStream extends FilterInputStream { 
     * @param flags bit flags for controlling the decoder; see the

     *        constants in {@link Base64}

     * @param encode true to encode, false to decode

     *

     * @hide

     */

    public Base64InputStream(InputStream in, int flags, boolean encode) {

        super(in);

core/java/android/util/base64/Base64OutputStream.java

+4 −3
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ import java.io.IOException; 
import java.io.OutputStream;



/**

 * An OutputStream that does either Base64 encoding or decoding on the

 * data written to it, writing the resulting data to another

 * OutputStream.

 * An OutputStream that does Base64 encoding on the data written to

 * it, writing the resulting data to another OutputStream.

 */

public class Base64OutputStream extends FilterOutputStream {

    private final boolean encode;
@@ -57,6 +56,8 @@ public class Base64OutputStream extends FilterOutputStream { 
     * @param flags bit flags for controlling the encoder; see the

     *        constants in {@link Base64}

     * @param encode true to encode, false to decode

     *

     * @hide

     */

    public Base64OutputStream(OutputStream out, int flags, boolean encode) {

        super(out);