commit 2d391027a69377d1d31c6283ccfd0ebe8599467f
author Slava Shklyaev <slavash@google.com> Tue Aug 25 14:23:01 2020 +0100
committer Slava Shklyaev <slavash@google.com> Fri Aug 28 16:57:51 2020 +0100
tree 2b41beccfac587a78e74294b7d2c3c1d368700a4
parent cdcd99836200940c93cf1ca64d83e1ce91f7ecf2

Fix memory leak

Bug: 166073521
Test: atest CtsNNAPIBenchmarkTestCases
Change-Id: Ic63d9f746ea8ae69aaf91d27b14e689409df8cdb
Merged-In: I74c5397b247e62a1159057bb18a24ba06e1be7c0
(cherry picked from commit 91433082cf3a882b4e38f4ae58afbe5216a74850)

tests/tests/neuralnetworks/benchmark/src/com/android/nn/benchmark/cts/NNAccuracyTest.java

diff --git a/tests/tests/neuralnetworks/benchmark/src/com/android/nn/benchmark/cts/NNAccuracyTest.java b/tests/tests/neuralnetworks/benchmark/src/com/android/nn/benchmark/cts/NNAccuracyTest.java
index 02921db..2c860ad 100644
--- a/tests/tests/neuralnetworks/benchmark/src/com/android/nn/benchmark/cts/NNAccuracyTest.java
+++ b/tests/tests/neuralnetworks/benchmark/src/com/android/nn/benchmark/cts/NNAccuracyTest.java
@@ -97,18 +97,19 @@
             return;
         }
 
-        NNTestBase test = mModel.createNNTestBase(/*useNNAPI=*/true,
-                /*enableIntermediateTensorsDump=*/false);
-        test.setupModel(mActivity);
-        Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
-                test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
-        BenchmarkResult benchmarkResult =
-                BenchmarkResult.fromInferenceResults(
-                        mModel.mModelName,
-                        BenchmarkResult.BACKEND_TFLITE_NNAPI,
-                        inferenceResults.first,
-                        inferenceResults.second,
-                        test.getEvaluator());
-        assertFalse(benchmarkResult.hasValidationErrors());
+        try (NNTestBase test = mModel.createNNTestBase(/*useNNAPI=*/true,
+                    /*enableIntermediateTensorsDump=*/false)) {
+            test.setupModel(mActivity);
+            Pair<List<InferenceInOutSequence>, List<InferenceResult>> inferenceResults =
+                    test.runBenchmarkCompleteInputSet(/*setRepeat=*/1, /*timeoutSec=*/3600);
+            BenchmarkResult benchmarkResult =
+                    BenchmarkResult.fromInferenceResults(
+                            mModel.mModelName,
+                            BenchmarkResult.BACKEND_TFLITE_NNAPI,
+                            inferenceResults.first,
+                            inferenceResults.second,
+                            test.getEvaluator());
+            assertFalse(benchmarkResult.hasValidationErrors());
+        }
     }
 }