commit a891dcfa2d5602c6c10994862401141b040fa94b
author Zhijun He <zhijunhe@google.com> Thu Jul 31 12:49:21 2014 -0700
committer Zhijun He <zhijunhe@google.com> Thu Jul 31 12:49:21 2014 -0700
tree 36bb8dfb20efd851080aa878e7503d2c5054758f
parent 83200377d6b550416d3acbfb174dc012ea19ca1b

Camera2: slow motion request should set the control.mode correctly

Change-Id: I22e2312ba37a128096cb529abcf7dd1103eb538b

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

diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
index 1051b59..b120000 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
@@ -346,8 +346,11 @@
                 CaptureRequest.CONTROL_MODE_USE_SCENE_MODE);
         recordingRequestBuilder.set(CaptureRequest.CONTROL_SCENE_MODE,
                 CaptureRequest.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO);
+
         CaptureRequest.Builder recordingOnlyBuilder =
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+        recordingOnlyBuilder.set(CaptureRequest.CONTROL_MODE,
+                CaptureRequest.CONTROL_MODE_USE_SCENE_MODE);
         recordingOnlyBuilder.set(CaptureRequest.CONTROL_SCENE_MODE,
                 CaptureRequest.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO);
         int slowMotionFactor = captureRate / videoFrameRate;