diff options
author | Andrew Hayden <andrewhayden@google.com> | 2016-04-15 02:37:46 +0100 |
---|---|---|
committer | Andrew Hayden <andrewhayden@google.com> | 2016-04-15 02:37:46 +0100 |
commit | ec0fc6394e5abd1dbd47fe58d2988b997bac60dc (patch) | |
tree | 4e33e8f93d08f6e70ab715d9829247bd1af20cac | |
parent | 829a724d79e17af6155c1cf66865342ba62376fc (diff) | |
download | platform_external_archive-patcher-ec0fc6394e5abd1dbd47fe58d2988b997bac60dc.tar.gz platform_external_archive-patcher-ec0fc6394e5abd1dbd47fe58d2988b997bac60dc.tar.bz2 platform_external_archive-patcher-ec0fc6394e5abd1dbd47fe58d2988b997bac60dc.zip |
Pull latest archive-patcher from upstream.
Sync to 5b806288f0ad7db536cc420a6b3b4d655be96cfb to pick up
bugfixes for Android.
BUG=28134433
Change-Id: I18912795bbb462e57e5038cd7e8e15dfb02905d2
4 files changed, 7 insertions, 6 deletions
diff --git a/README.android b/README.android index 104ddf3..bd0bd16 100644 --- a/README.android +++ b/README.android @@ -1,6 +1,6 @@ Any Android specific modifications to upstream archive-patcher should be listed here: -(1) Deleted /integrationtest, /tools, and /generator as these are not intended - to be used on Android. Only /shared and /applier remain. +(1) Deleted /integrationtest, /tools, /explainer and /generator as these are not + intended to be used on Android. Only /shared and /applier remain. diff --git a/README.version b/README.version index ffc3b5d..3359ef1 100644 --- a/README.version +++ b/README.version @@ -1,5 +1,5 @@ -URL: https://github.com/andrewhayden/archive-patcher/archive/ffadc0ce137449abfd5b72773b77e4eb7df24d19.zip -Version: ffadc0ce137449abfd5b72773b77e4eb7df24d19 +URL: https://github.com/andrewhayden/archive-patcher/archive/5b806288f0ad7db536cc420a6b3b4d655be96cfb.zip +Version: 5b806288f0ad7db536cc420a6b3b4d655be96cfb BugComponent: 129875 Owners: andrewhayden, admo diff --git a/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java b/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java index f5f477b..8cbffda 100644 --- a/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java +++ b/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java @@ -355,6 +355,7 @@ public class DefaultDeflateCompatibilityWindow { } } } + compressor.release(); return result; } } diff --git a/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java b/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java index 4aa88f7..0c7250b 100644 --- a/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java +++ b/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java @@ -105,8 +105,8 @@ public class DeflateCompressor implements Compressor { "compressionLevel must be in the range [0,9]: " + compressionLevel); } if (deflater != null && compressionLevel != this.compressionLevel) { - deflater.setLevel(compressionLevel); deflater.reset(); + deflater.setLevel(compressionLevel); } this.compressionLevel = compressionLevel; } @@ -126,8 +126,8 @@ public class DeflateCompressor implements Compressor { */ public void setStrategy(int strategy) { if (deflater != null && strategy != this.strategy) { - deflater.setStrategy(strategy); deflater.reset(); + deflater.setStrategy(strategy); } this.strategy = strategy; } |