From 94fe3798f590963d9753df35f627e9f705a5d948 Mon Sep 17 00:00:00 2001
From: Miguel Aranda <miguelaranda@google.com>
Date: Fri, 13 May 2022 19:31:08 +0000
Subject: [PATCH] Merge "Fix ZipFilePerfTest issues by closing the file in each
 loop iteration." am: 90c3935195 am: 9c051367f8 am: 4c2143df58 am: 10eceff1b1
 am: b90b509fc7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096495

Change-Id: I5f7b1c7f88ae0340c52ebad56132ec0f1d042e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit a65e6fe7efa131eee101851501c14445eb442cea)
Bug: 231407205
---
 .../perftests/core/src/android/libcore/ZipFilePerfTest.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
index 517e3ce39d7e8..31c92ba5e2078 100644
--- a/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
+++ b/apct-tests/perftests/core/src/android/libcore/ZipFilePerfTest.java
@@ -70,6 +70,9 @@ public class ZipFilePerfTest {
         BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
         while (state.keepRunning()) {
             ZipFile zf = new ZipFile(mFile);
+            state.pauseTiming();
+            zf.close();
+            state.resumeTiming();
         }
     }