Bug 1302189 - [1.2] Release native zip only on finalize to prevent premature unmapping of referenced memory. r=kats

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/ByteBufferInputStream.java

@@ -26,8 +26,8 @@ class ByteBufferInputStream extends InputStream {
 
     @Override
     public void close() {
-        mBuf = null;
+        // Do nothing, we need to keep the native references around for child
-        mNativeRef.release();
+        // buffers.
     }
 
     @Override

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/NativeZip.java

@@ -38,10 +38,6 @@ public class NativeZip implements NativeReference {
         release();
     }
 
-    public void close() {
-        release();
-    }
-
     @Override
     public void release() {
         if (mObj != 0) {

mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoJarReader.java

@@ -66,9 +66,6 @@ public final class GeckoJarReader {
                     Log.e(LOGTAG, "Error closing stream", ex);
                 }
             }
-            if (zip != null) {
-                zip.close();
-            }
         }
 
         return bitmap;
@@ -97,9 +94,6 @@ public final class GeckoJarReader {
                     Log.e(LOGTAG, "Error closing reader", ex);
                 }
             }
-            if (zip != null) {
-                zip.close();
-            }
         }
 
         return text;