Merge "Revert "Don't pause perftest timing while closing ZipFile between iterations"" into main

1 files changed, 3 insertions, 1 deletions

diff --git a/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
index c77528021201..ed669beae1ce 100644
--- a/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
+++ b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
@@ -63,12 +63,14 @@ public class ZipFilePerfTest {
 
     @Test
     @Parameters(method = "getData")
-    public void timeZipFileOpenClose(int numEntries) throws Exception {
+    public void timeZipFileOpen(int numEntries) throws Exception {
         setUp(numEntries);
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
         while (state.keepRunning()) {
             ZipFile zf = new ZipFile(mFile);
+            state.pauseTiming();
             zf.close();
+            state.resumeTiming();
         }
     }