Merge change I2cdad38a

* changes:
  Update archive to Harmony r820767.

1 files changed, 1 insertions, 13 deletions

diff --git a/archive/src/main/java/java/util/zip/Deflater.java b/archive/src/main/java/java/util/zip/Deflater.java
index 38771a8..ad17cf2 100644
--- a/archive/src/main/java/java/util/zip/Deflater.java
+++ b/archive/src/main/java/java/util/zip/Deflater.java
@@ -17,9 +17,6 @@
 
 package java.util.zip;
 
-// BEGIN android-changed
-// import org.apache.harmony.luni.platform.OSResourcesMonitor;
-// END android-changed
 
 /**
  * This class compresses data using the <i>DEFLATE</i> algorithm (see <a
@@ -149,8 +146,7 @@ public class Deflater {
             throw new IllegalArgumentException();
         }
         compressLevel = level;
-        streamHandle = createStreamWithMemoryEnsurance(compressLevel, strategy,
-                noHeader);
+        streamHandle = createStream(compressLevel, strategy, noHeader);
     }
 
     /**
@@ -495,13 +491,5 @@ public class Deflater {
         return getTotalOutImpl(streamHandle);
     }
 
-    private long createStreamWithMemoryEnsurance(int level, int strategy1,
-            boolean noHeader1) {
-        // BEGIN android-changed
-        // OSResourcesMonitor.ensurePhysicalMemoryCapacity();
-        // END android-changed
-        return createStream(level, strategy1, noHeader1);
-    }
-
     private native long createStream(int level, int strategy1, boolean noHeader1);
 }