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

Commit 300ac5ea authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by android-build-merger
Browse files

Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am:... 

Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am: 4ee94a6a am: 104e268a am: b2d7fe1f
am: 92151fec

Change-Id: I4bfe4e388a7276779240b7886fa3e46b78f1297e
parents e4e4b906 92151fec

api/current.txt

+7 −7
Original line number Diff line number Diff line
@@ -62610,13 +62610,13 @@ package java.util.jar { 
    ctor public Attributes.Name(java.lang.String);

    field public static final java.util.jar.Attributes.Name CLASS_PATH;

    field public static final java.util.jar.Attributes.Name CONTENT_TYPE;

    field public static final java.util.jar.Attributes.Name EXTENSION_INSTALLATION;

    field public static final deprecated java.util.jar.Attributes.Name EXTENSION_INSTALLATION;

    field public static final java.util.jar.Attributes.Name EXTENSION_LIST;

    field public static final java.util.jar.Attributes.Name EXTENSION_NAME;

    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_TITLE;

    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_URL;

    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_URL;

    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR;

    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;

    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;

    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VERSION;

    field public static final java.util.jar.Attributes.Name MAIN_CLASS;

    field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;
@@ -62683,11 +62683,11 @@ package java.util.jar { 
  }









  public static abstract interface Pack200.Packer {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void pack(java.util.jar.JarFile, java.io.OutputStream) throws java.io.IOException;









    method public abstract void pack(java.util.jar.JarInputStream, java.io.OutputStream) throws java.io.IOException;









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    field public static final java.lang.String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";









    field public static final java.lang.String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";









    field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";








@@ -62710,9 +62710,9 @@ package java.util.jar {







  }

















  public static abstract interface Pack200.Unpacker {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void unpack(java.io.InputStream, java.util.jar.JarOutputStream) throws java.io.IOException;









    method public abstract void unpack(java.io.File, java.util.jar.JarOutputStream) throws java.io.IOException;









    field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";

























api/system-current.txt



+7
−7






























Original line number
Diff line number
Diff line







@@ -66156,13 +66156,13 @@ package java.util.jar {







    ctor public Attributes.Name(java.lang.String);









    field public static final java.util.jar.Attributes.Name CLASS_PATH;









    field public static final java.util.jar.Attributes.Name CONTENT_TYPE;









    field public static final java.util.jar.Attributes.Name EXTENSION_INSTALLATION;









    field public static final deprecated java.util.jar.Attributes.Name EXTENSION_INSTALLATION;









    field public static final java.util.jar.Attributes.Name EXTENSION_LIST;









    field public static final java.util.jar.Attributes.Name EXTENSION_NAME;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_TITLE;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_URL;









    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_URL;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;









    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VERSION;









    field public static final java.util.jar.Attributes.Name MAIN_CLASS;









    field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;








@@ -66229,11 +66229,11 @@ package java.util.jar {







  }

















  public static abstract interface Pack200.Packer {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void pack(java.util.jar.JarFile, java.io.OutputStream) throws java.io.IOException;









    method public abstract void pack(java.util.jar.JarInputStream, java.io.OutputStream) throws java.io.IOException;









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    field public static final java.lang.String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";









    field public static final java.lang.String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";









    field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";








@@ -66256,9 +66256,9 @@ package java.util.jar {







  }

















  public static abstract interface Pack200.Unpacker {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void unpack(java.io.InputStream, java.util.jar.JarOutputStream) throws java.io.IOException;









    method public abstract void unpack(java.io.File, java.util.jar.JarOutputStream) throws java.io.IOException;









    field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";

























api/test-current.txt



+7
−7






























Original line number
Diff line number
Diff line







@@ -62899,13 +62899,13 @@ package java.util.jar {







    ctor public Attributes.Name(java.lang.String);









    field public static final java.util.jar.Attributes.Name CLASS_PATH;









    field public static final java.util.jar.Attributes.Name CONTENT_TYPE;









    field public static final java.util.jar.Attributes.Name EXTENSION_INSTALLATION;









    field public static final deprecated java.util.jar.Attributes.Name EXTENSION_INSTALLATION;









    field public static final java.util.jar.Attributes.Name EXTENSION_LIST;









    field public static final java.util.jar.Attributes.Name EXTENSION_NAME;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_TITLE;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_URL;









    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_URL;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;









    field public static final deprecated java.util.jar.Attributes.Name IMPLEMENTATION_VENDOR_ID;









    field public static final java.util.jar.Attributes.Name IMPLEMENTATION_VERSION;









    field public static final java.util.jar.Attributes.Name MAIN_CLASS;









    field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;








@@ -62972,11 +62972,11 @@ package java.util.jar {







  }

















  public static abstract interface Pack200.Packer {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void pack(java.util.jar.JarFile, java.io.OutputStream) throws java.io.IOException;









    method public abstract void pack(java.util.jar.JarInputStream, java.io.OutputStream) throws java.io.IOException;









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    field public static final java.lang.String CLASS_ATTRIBUTE_PFX = "pack.class.attribute.";









    field public static final java.lang.String CODE_ATTRIBUTE_PFX = "pack.code.attribute.";









    field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";








@@ -62999,9 +62999,9 @@ package java.util.jar {







  }

















  public static abstract interface Pack200.Unpacker {









    method public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void addPropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract java.util.SortedMap<java.lang.String, java.lang.String> properties();









    method public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public default deprecated void removePropertyChangeListener(java.beans.PropertyChangeListener);









    method public abstract void unpack(java.io.InputStream, java.util.jar.JarOutputStream) throws java.io.IOException;









    method public abstract void unpack(java.io.File, java.util.jar.JarOutputStream) throws java.io.IOException;









    field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";