commit 169786046acc9e73074b038c2ece5f93d69775c9
author Ruben Brunk <rubenbrunk@google.com> Wed Apr 15 18:50:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 15 18:50:01 2015 +0000
tree 305807338166c7678e55b37bfc8a2d83036b1005
parent 53171d86b5a74a8f846e5c0b6ebdf8d9078c8a4f
parent 2024fae2fcff9c73acf3bff2ff853ae4cd8f00b3

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

* commit '2024fae2fcff9c73acf3bff2ff853ae4cd8f00b3':
  DO NOT MERGE: camera2 CTS: Actually close Images in StillCaptureTest.

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 2554b17..b4113e5 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -426,6 +426,10 @@
         waitForNumResults(resultListener, NUM_FRAMES_WAITED);
 
         stopPreview();
+
+        // Free image resources
+        image.close();
+        closeImageReader();
         return;
     }
 
@@ -595,6 +599,9 @@
         Image image = imageListener.getImage(CAPTURE_IMAGE_TIMEOUT_MS);
         validateJpegCapture(image, maxStillSz);
 
+        // Free image resources
+        image.close();
+
         stopPreview();
     }
 
@@ -641,6 +648,10 @@
                 Image image = imageListener.getImage((mStaticInfo.isHardwareLevelLegacy()) ?
                         RELAXED_CAPTURE_IMAGE_TIMEOUT_MS : 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();
@@ -691,6 +702,9 @@
             dumpFile(rawFileName, rawBuffer);
         }
 
+        // Free image resources
+        image.close();
+
         stopPreview();
     }
 
@@ -1008,6 +1022,9 @@
             if (!mStaticInfo.isHardwareLevelLegacy()) {
                 jpegTestExifExtraTags(exif, maxStillSz, stillResult);
             }
+
+            // Free image resources
+            image.close();
         }
     }