Fixed bug in ZFile that did not allow RO open.

When opening a V2 signed APK, ZFile would force the file
to be marked "dirty" when setting the extra offset for the
central directory required by V2 signature. This would
force the zip to be written.

Test: included
Change-Id: I799c1b7dd3a927591e9d3ed410494bfa0b33300b

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/android/apkzlib/zip/ZFile.java b/src/main/java/com/android/apkzlib/zip/ZFile.java
index 396d8ac..d86a3c5 100644
--- a/src/main/java/com/android/apkzlib/zip/ZFile.java
+++ b/src/main/java/com/android/apkzlib/zip/ZFile.java
@@ -580,9 +580,13 @@ public class ZFile implements Closeable {
             entryEndOffset = 0;
         }
 
+        /*
+         * Check if there is an extra central directory offset. If there is, save it. Note that
+         * we can't call extraDirectoryOffset() because that would mark the file as dirty.
+         */
         long extraOffset = directoryStartOffset - entryEndOffset;
         Verify.verify(extraOffset >= 0, "extraOffset (%s) < 0", extraOffset);
-        setExtraDirectoryOffset(extraOffset);
+        extraDirectoryOffset = extraOffset;
     }
 
     /**