Merge "Terminate Looper if Video Snapshot Not Supported"
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 44b79b1..ab1bbba 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -2851,7 +2851,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();