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

Commit 96a13681 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove dependency on InflaterInputStream.closed field. 

In upstream OpenJDK the InflaterInputStream.closed field is private.
During integration of OpenJDK into Android it was changed to be
protected so that it could be used by StrictJarFile, and in the process
was accidentally made part of the public API. This change removes the
StrictJarFile dependency on that field.

Bug: 111061052
Test: checkbuild, flash and run FrameworkCoreTests
Change-Id: I8aee1c444cf27e7078b848c65e0433c831ab06a0
parent bb352287

core/java/android/util/jar/StrictJarFile.java

+7 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ public final class StrictJarFile { 
    public static class ZipInflaterInputStream extends InflaterInputStream {

        private final ZipEntry entry;

        private long bytesRead = 0;

        private boolean closed;



        public ZipInflaterInputStream(InputStream is, Inflater inf, int bsize, ZipEntry entry) {

            super(is, inf, bsize);
@@ -424,6 +425,12 @@ public final class StrictJarFile { 
            }

            return super.available() == 0 ? 0 : (int) (entry.getSize() - bytesRead);

        }



        @Override

        public void close() throws IOException {

            super.close();

            closed = true;

        }

    }



    /**