Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"

Browse Source 
am: 4ee94a6a9b

Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
This commit is contained in:
Przemyslaw Szczepaniak
2016-12-09 10:54:03 +00:00
committed by android-build-merger
parent 1a2fa0f372 4ee94a6a9b
commit 104e268a14
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.txt
View File

@@ -62045,13 +62045,13 @@ package java.util.jar {
ctor public Attributes.Name(java.lang.String); 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 CLASS_PATH;
field public static final java.util.jar.Attributes.Name CONTENT_TYPE; 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_LIST;
field public static final java.util.jar.Attributes.Name EXTENSION_NAME; 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_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;
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 IMPLEMENTATION_VERSION;
field public static final java.util.jar.Attributes.Name MAIN_CLASS; field public static final java.util.jar.Attributes.Name MAIN_CLASS;
field public static final java.util.jar.Attributes.Name MANIFEST_VERSION; field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;
@@ -62118,11 +62118,11 @@ package java.util.jar {
} }
public static abstract interface Pack200.Packer { 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.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 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 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 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 CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint"; field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";
@@ -62145,9 +62145,9 @@ package java.util.jar {
} }
public static abstract interface Pack200.Unpacker { 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 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.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; 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"; field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";

14
api/system-current.txt
View File

@@ -65606,13 +65606,13 @@ package java.util.jar {
ctor public Attributes.Name(java.lang.String); 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 CLASS_PATH;
field public static final java.util.jar.Attributes.Name CONTENT_TYPE; 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_LIST;
field public static final java.util.jar.Attributes.Name EXTENSION_NAME; 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_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;
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 IMPLEMENTATION_VERSION;
field public static final java.util.jar.Attributes.Name MAIN_CLASS; field public static final java.util.jar.Attributes.Name MAIN_CLASS;
field public static final java.util.jar.Attributes.Name MANIFEST_VERSION; field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;
@@ -65679,11 +65679,11 @@ package java.util.jar {
} }
public static abstract interface Pack200.Packer { 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.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 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 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 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 CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint"; field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";
@@ -65706,9 +65706,9 @@ package java.util.jar {
} }
public static abstract interface Pack200.Unpacker { 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 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.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; 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"; field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";

14
api/test-current.txt
View File

@@ -62136,13 +62136,13 @@ package java.util.jar {
ctor public Attributes.Name(java.lang.String); 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 CLASS_PATH;
field public static final java.util.jar.Attributes.Name CONTENT_TYPE; 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_LIST;
field public static final java.util.jar.Attributes.Name EXTENSION_NAME; 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_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;
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 IMPLEMENTATION_VERSION;
field public static final java.util.jar.Attributes.Name MAIN_CLASS; field public static final java.util.jar.Attributes.Name MAIN_CLASS;
field public static final java.util.jar.Attributes.Name MANIFEST_VERSION; field public static final java.util.jar.Attributes.Name MANIFEST_VERSION;
@@ -62209,11 +62209,11 @@ package java.util.jar {
} }
public static abstract interface Pack200.Packer { 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.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 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 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 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 CODE_ATTRIBUTE_PFX = "pack.code.attribute.";
field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint"; field public static final java.lang.String DEFLATE_HINT = "pack.deflate.hint";
@@ -62236,9 +62236,9 @@ package java.util.jar {
} }
public static abstract interface Pack200.Unpacker { 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 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.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; 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"; field public static final java.lang.String DEFLATE_HINT = "unpack.deflate.hint";