commit f70615f2b3f155ba4176ab431a854ca6d2fc086e
author Raman Tenneti <rtenneti@google.com> Fri Aug 28 00:13:40 2020 +0000
committer Bowgo Tsai <bowgotsai@google.com> Fri Aug 28 09:21:20 2020 +0800
tree 54517f43074c0a841bebb2311f5c3e77f53575da
parent bd2f8bcbafd202dc524a7b1bf60fca47bb0c4050

Revert "Fix memory leak"

This reverts commit 91433082cf3a882b4e38f4ae58afbe5216a74850.

Reason for revert: b/166682761 - build failures on rvc-dev branch

Bug: 166073521
Bug: 166682761
Test: a cherry-pick from aosp/master

Change-Id: I697fbdd71a3ea158eb4ec0806bedc1f014a0f34c
Merged-In: I697fbdd71a3ea158eb4ec0806bedc1f014a0f34c
(cherry picked from commit 7f9283bffd0ea22284feadabe9f78d09ebe367a4)

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 2c860ad..02921db 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,19 +97,18 @@
             return;
         }
 
-        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());
-        }
+        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());
     }
 }