summaryrefslogtreecommitdiffstats
path: root/archive/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* merge more modules into luniPeter Hallam2010-04-2736-8165/+0
|
* Add Java 6's new java.util.zip API.Elliott Hughes2010-04-088-33/+485
| | | | | | | | | | | | This passes all but four of the harmony tests. The others fail because our Deflater works differently to theirs; we already fail the corresponding Deflater test. The only jtreg test for ZipError neither passes nor fails: it appears that this can only be thrown on Windows. Bug: 2497395 Change-Id: I79687495da42507dda692c890ec939bdbc9be2b3
* resolved conflicts for merge of dd53c703 to dalvik-devElliott Hughes2010-04-052-9/+2
|\ | | | | | | Change-Id: Ia95af76e2995ce7fb0778b020baf2882a8b0a3dd
| * Froyo InputStream.available documentation improvement.Elliott Hughes2010-04-052-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This method causes a lot of confusion, and we can do a lot better. (Ideally, the API would either not exist or be something like "public boolean ready()".) I've removed poor-quality documentation overrides too, so the full documentation is visible in most places. (InflaterInputStream is an obvious exception.) Also, to a lesser extent, improve the InputStream.skip documentation. Change-Id: I6d6cd788e6a32ad4a2613d1e381610f1ad8575fe
* | Remove all remaining "@since Android" tags.Elliott Hughes2010-03-222-2/+0
| | | | | | | | | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* | am 101cbfe4: Merge "Implementing the Java 7 APIs for DeflaterOutputStreams."Jesse Wilson2010-03-052-16/+115
|\ \ | |/ | | | | | | | | | | Merge commit '101cbfe486ad1744f666e924f600dd1b8cdecea7' into dalvik-dev * commit '101cbfe486ad1744f666e924f600dd1b8cdecea7': Implementing the Java 7 APIs for DeflaterOutputStreams.
| * Implementing the Java 7 APIs for DeflaterOutputStreams.Jesse Wilson2010-03-052-16/+115
| | | | | | | | See bug 1729487.
* | Fix accidental API pollution in java.util.zip.Elliott Hughes2010-02-054-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | Package-private interface ZipConstants turns out to be implemented by all the public Zip* classes in the package, so they can uselessly expose duplicate copies of the constants. This means I can't add my own constants there because they'll leak. This didn't break the build because we lose the "implements ZipConstants" and ZipConstants.class somewhere around the apicheck part of the build. See http://b/2421864 for that. Anyway, let's mop up the spill before anyone can see it...
* | Fix decoding of filenames in zip files, when read by ZipFile.Elliott Hughes2010-02-044-19/+40
|/ | | | | | | | | | | | | Java always writes UTF-8 filenames in zip files, but harmony cunningly always reads them back as ISO-8859-1. Fix that, and also set the flag that says "these filenames are UTF-8" (the RI will do this from Java 7 on). Note that this patch doesn't actually touch ZipFile because the bug is in the package-private ZipEntry constructor that's used by ZipFile.readCentralDirectory. Bug: http://code.google.com/p/android/issues/detail?id=4690
* Merge branch 'archive_888752' into archive_dalvikJesse Wilson2009-12-0931-817/+538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libcore/archive/build.xml libcore/archive/src/main/java/java/util/jar/JarFile.java libcore/archive/src/main/java/java/util/zip/GZIPInputStream.java libcore/archive/src/main/java/java/util/zip/Inflater.java libcore/archive/src/main/java/java/util/zip/InflaterInputStream.java libcore/archive/src/main/java/java/util/zip/ZipEntry.java libcore/archive/src/main/java/java/util/zip/ZipFile.java libcore/archive/src/main/java/java/util/zip/ZipInputStream.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties libcore/archive/src/main/native/archive/unix/exports.txt libcore/archive/src/main/native/archive/unix/makefile libcore/archive/src/main/native/archive/windows/makefile libcore/archive/src/main/native/archive_copyright.c libcore/archive/src/main/native/jarfile.c libcore/archive/src/main/native/java_util_zip_Deflater.c libcore/archive/src/main/native/zip.c libcore/archive/src/main/native/zipcache.c libcore/archive/src/main/native/zlib/unix/makefile libcore/archive/src/main/native/zlib/windows/makefile libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
* Respond to impossible CloneNotSupportedExceptions with AssertionErrors.Jesse Wilson2009-10-161-1/+1
| | | | See bug 2183132.
* am 8673ee75: am 9a35ef1b: Guarantee deflaters get cleaned up, even if ↵Jesse Wilson2009-10-151-1/+8
|\ | | | | | | | | | | | | | | | | subclassed. Merge commit '8673ee75052e7398aa6f5925e968d6a0b2419be8' * commit '8673ee75052e7398aa6f5925e968d6a0b2419be8': Guarantee deflaters get cleaned up, even if subclassed.
| * Guarantee deflaters get cleaned up, even if subclassed.Jesse Wilson2009-10-151-1/+8
| | | | | | | | See bug 2186927
* | Update archive to Harmony r820767.Jesse Wilson2009-10-011-13/+1
| |
* | Adding checks for already-closed ZIP files.Jesse Wilson2009-09-201-24/+36
|/ | | | See bug 1635955.
* Fixing available() and close() for archive streams.Jesse Wilson2009-09-183-104/+130
| | | | | | | This builds on work originally submitted to Harmony: http://issues.apache.org/jira/browse/HARMONY-6210 The approach is to change available() to eagerly set eof to true, rather than waiting for a read to fail.
* Merge change 25126 into eclairAndroid (Google) Code Review2009-09-163-36/+72
|\ | | | | | | | | * changes: Update archive to the r802921 from Harmony.
| * Update archive to the r802921 from Harmony.Jesse Wilson2009-09-163-36/+72
| | | | | | | | | | This overdue update includes fixes for some Eclair bugs that I originally submitted to Harmony: 1876785, 1635982, 1635998
* | JarFile was not able to verify signed files with size 0.Urs Grob2009-09-071-3/+22
|/ | | | | | This regressen was introduced by harmony optimizations done in HARMONY-4569. This fix allows for jar entries of size 0 to also get successfully validated. A regression test has been added to JarFileTest.
* Updating archive to Harmony r772995.Jesse Wilson2009-06-0931-1249/+938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: Adding @TestTargetNew tags Initial merge of branch 'archive_772995' into archive_dalvik. Fixed some problems, including InflaterInputStream.available() and JarFile.skip() bugs. Conflicts: libcore/archive/.classpath libcore/archive/META-INF/MANIFEST.MF libcore/archive/build.xml libcore/archive/make/hyproperties.xml libcore/archive/src/main/java/java/util/jar/Attributes.java libcore/archive/src/main/java/java/util/jar/JarEntry.java libcore/archive/src/main/java/java/util/jar/JarException.java libcore/archive/src/main/java/java/util/jar/JarFile.java libcore/archive/src/main/java/java/util/jar/JarInputStream.java libcore/archive/src/main/java/java/util/jar/JarVerifier.java libcore/archive/src/main/java/java/util/jar/Manifest.java libcore/archive/src/main/java/java/util/jar/Pack200.java libcore/archive/src/main/java/java/util/zip/Adler32.java libcore/archive/src/main/java/java/util/zip/CRC32.java libcore/archive/src/main/java/java/util/zip/Checksum.java libcore/archive/src/main/java/java/util/zip/DataFormatException.java libcore/archive/src/main/java/java/util/zip/Deflater.java libcore/archive/src/main/java/java/util/zip/DeflaterOutputStream.java libcore/archive/src/main/java/java/util/zip/GZIPInputStream.java libcore/archive/src/main/java/java/util/zip/GZIPOutputStream.java libcore/archive/src/main/java/java/util/zip/Inflater.java libcore/archive/src/main/java/java/util/zip/InflaterInputStream.java libcore/archive/src/main/java/java/util/zip/ZipEntry.java libcore/archive/src/main/java/java/util/zip/ZipException.java libcore/archive/src/main/java/java/util/zip/ZipFile.java libcore/archive/src/main/java/java/util/zip/ZipInputStream.java libcore/archive/src/main/java/java/util/zip/ZipOutputStream.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java libcore/archive/src/main/native/archive/shared/archiveglob.c libcore/archive/src/main/native/archive/shared/jarfile.c libcore/archive/src/main/native/archive/shared/zip.c libcore/archive/src/main/native/archive/shared/zip.h libcore/archive/src/main/native/archive/unix/makefile libcore/archive/src/main/native/archive/windows/makefile libcore/archive/src/main/native/java_util_zip_Adler32.c libcore/archive/src/main/native/java_util_zip_CRC32.c libcore/archive/src/main/native/java_util_zip_Deflater.c libcore/archive/src/main/native/java_util_zip_Inflater.c libcore/archive/src/main/native/zip/shared/hyzip.nls libcore/archive/src/main/native/zip/unix/makefile libcore/archive/src/main/native/zipsup.h libcore/archive/src/main/native/zlib/unix/makefile libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java commit 946f165f5b592f4453fd8f2c19766921544d38dd Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:12:55 2009 -0700 Strip @Since Android 1.0 from Archive commit 3498f216d7e826bfc9c4cc7c0da35830ca239367 Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:09:05 2009 -0700 Dalvik archive commit 62e9db90bc6aa6b5d1c897cccdd616d812672677 Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:07:51 2009 -0700 Archive 772995 commit d1bf618681d6badf1b50edaf204a083d3912213d Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:06:36 2009 -0700 Archive 527399
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0333-0/+8100
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0333-8100/+0
|
* auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-191-16/+25
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1730-2926/+3662
|
* Initial ContributionThe Android Open Source Project2008-10-2133-0/+7355
generated by cgit v1.1 at 2025-08-17 10:54:01 +0000