Merge "Close files after reading them"
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
old mode 100644
new mode 100755
index c6c4a44..3b29f6a
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -2840,7 +2840,10 @@
     private void testVideoSnapshotByCamera(int cameraId) throws Exception {
         initializeMessageLooper(cameraId);
         Camera.Parameters parameters = mCamera.getParameters();
-        if (!parameters.isVideoSnapshotSupported()) return;
+        if (!parameters.isVideoSnapshotSupported()) {
+            terminateMessageLooper();
+            return;
+        }
 
         SurfaceHolder holder = getActivity().getSurfaceView().getHolder();