commit 2024fae2fcff9c73acf3bff2ff853ae4cd8f00b3
author Ruben Brunk <rubenbrunk@google.com> Thu Mar 12 21:03:55 2015 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Apr 15 18:01:11 2015 +0000
tree 2e6eba1c5b9d63f4cb70218d1fd85d6871b9582a
parent 755f327fa03aa43a988fe3025d5ff766566c455f

DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest.

Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
(cherry picked from commit 58ad7d92e06c2d0c6ab59c5b7be392bc9794bbe8)

tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
index e816659..37eff10 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -440,6 +440,10 @@
         waitForNumResults(resultListener, NUM_FRAMES_WAITED);
 
         stopPreview();
+
+        // Free image resources
+        image.close();
+        closeImageReader();
         return;
     }
 
@@ -609,6 +613,9 @@
         Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
         validateJpegCapture(image, maxStillSz);
 
+        // Free image resources
+        image.close();
+
         stopPreview();
     }
 
@@ -654,6 +661,10 @@
                 mSession.capture(stillRequest.build(), resultListener, mHandler);
                 Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
                 validateJpegCapture(image, stillSz);
+
+                // Free image resources
+                image.close();
+
                 // stopPreview must be called here to make sure next time a preview stream
                 // is created with new size.
                 stopPreview();
@@ -704,6 +715,9 @@
             dumpFile(rawFileName, rawBuffer);
         }
 
+        // Free image resources
+        image.close();
+
         stopPreview();
     }
 
@@ -1021,6 +1035,9 @@
             if (!mStaticInfo.isHardwareLevelLegacy()) {
                 jpegTestExifExtraTags(exif, maxStillSz, stillResult);
             }
+
+            // Free image resources
+            image.close();
         }
     }