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

Commit 8cdc25b4 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Add Base64 from OpenJDK 8u60" am: 63a07e80 

am: 24bd141c

Change-Id: I15b2aaaf8d6791d4a561fa935c7ab960ac22c4d8
parents fc0ee229 24bd141c

api/current.txt

+27 −0
Original line number Diff line number Diff line
@@ -58327,6 +58327,33 @@ package java.util { 
    method public static java.lang.String toString(java.lang.Object[]);

  }













  public class Base64 {













    method public static java.util.Base64.Decoder getDecoder();













    method public static java.util.Base64.Encoder getEncoder();













    method public static java.util.Base64.Decoder getMimeDecoder();













    method public static java.util.Base64.Encoder getMimeEncoder();













    method public static java.util.Base64.Encoder getMimeEncoder(int, byte[]);













    method public static java.util.Base64.Decoder getUrlDecoder();













    method public static java.util.Base64.Encoder getUrlEncoder();













  }

























  public static class Base64.Decoder {













    method public byte[] decode(byte[]);













    method public byte[] decode(java.lang.String);













    method public int decode(byte[], byte[]);













    method public java.nio.ByteBuffer decode(java.nio.ByteBuffer);













    method public java.io.InputStream wrap(java.io.InputStream);













  }

























  public static class Base64.Encoder {













    method public byte[] encode(byte[]);













    method public int encode(byte[], byte[]);













    method public java.nio.ByteBuffer encode(java.nio.ByteBuffer);













    method public java.lang.String encodeToString(byte[]);













    method public java.util.Base64.Encoder withoutPadding();













    method public java.io.OutputStream wrap(java.io.OutputStream);













  }



























  public class BitSet implements java.lang.Cloneable java.io.Serializable {















    ctor public BitSet();















    ctor public BitSet(int);

























api/system-current.txt



+27
−0




























Original line number
Diff line number
Diff line








@@ -61684,6 +61684,33 @@ package java.util {













    method public static java.lang.String toString(java.lang.Object[]);















  }



























  public class Base64 {













    method public static java.util.Base64.Decoder getDecoder();













    method public static java.util.Base64.Encoder getEncoder();













    method public static java.util.Base64.Decoder getMimeDecoder();













    method public static java.util.Base64.Encoder getMimeEncoder();













    method public static java.util.Base64.Encoder getMimeEncoder(int, byte[]);













    method public static java.util.Base64.Decoder getUrlDecoder();













    method public static java.util.Base64.Encoder getUrlEncoder();













  }

























  public static class Base64.Decoder {













    method public byte[] decode(byte[]);













    method public byte[] decode(java.lang.String);













    method public int decode(byte[], byte[]);













    method public java.nio.ByteBuffer decode(java.nio.ByteBuffer);













    method public java.io.InputStream wrap(java.io.InputStream);













  }

























  public static class Base64.Encoder {













    method public byte[] encode(byte[]);













    method public int encode(byte[], byte[]);













    method public java.nio.ByteBuffer encode(java.nio.ByteBuffer);













    method public java.lang.String encodeToString(byte[]);













    method public java.util.Base64.Encoder withoutPadding();













    method public java.io.OutputStream wrap(java.io.OutputStream);













  }



























  public class BitSet implements java.lang.Cloneable java.io.Serializable {















    ctor public BitSet();















    ctor public BitSet(int);

























api/test-current.txt



+27
−0




























Original line number
Diff line number
Diff line








@@ -58407,6 +58407,33 @@ package java.util {













    method public static java.lang.String toString(java.lang.Object[]);















  }



























  public class Base64 {













    method public static java.util.Base64.Decoder getDecoder();













    method public static java.util.Base64.Encoder getEncoder();













    method public static java.util.Base64.Decoder getMimeDecoder();













    method public static java.util.Base64.Encoder getMimeEncoder();













    method public static java.util.Base64.Encoder getMimeEncoder(int, byte[]);













    method public static java.util.Base64.Decoder getUrlDecoder();













    method public static java.util.Base64.Encoder getUrlEncoder();













  }

























  public static class Base64.Decoder {













    method public byte[] decode(byte[]);













    method public byte[] decode(java.lang.String);













    method public int decode(byte[], byte[]);













    method public java.nio.ByteBuffer decode(java.nio.ByteBuffer);













    method public java.io.InputStream wrap(java.io.InputStream);













  }

























  public static class Base64.Encoder {













    method public byte[] encode(byte[]);













    method public int encode(byte[], byte[]);













    method public java.nio.ByteBuffer encode(java.nio.ByteBuffer);













    method public java.lang.String encodeToString(byte[]);













    method public java.util.Base64.Encoder withoutPadding();













    method public java.io.OutputStream wrap(java.io.OutputStream);













  }



























  public class BitSet implements java.lang.Cloneable java.io.Serializable {















    ctor public BitSet();















    ctor public BitSet(int);