commit a833e0eb1c28c19da4aed62948cb9ce4a8906671
author Zhijun He <zhijunhe@google.com> Tue Jul 29 20:06:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 24 15:37:54 2014 +0000
tree c55a65d65bf818fe21f325caae51c75be42dd677
parent 0e8519f51ec28e6708d428e48dee514a8903bb2d
parent 9b260528e978df4ec067584c86c1602a60672fcf

Merge "Camera2: fix slow motion test bug" into lmp-dev

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 b8c74df..732ccf4 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
@@ -342,6 +342,8 @@
 
         CaptureRequest.Builder recordingRequestBuilder =
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+        recordingRequestBuilder.set(CaptureRequest.CONTROL_MODE,
+                CaptureRequest.CONTROL_MODE_USE_SCENE_MODE);
         recordingRequestBuilder.set(CaptureRequest.CONTROL_SCENE_MODE,
                 CaptureRequest.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO);
         CaptureRequest.Builder recordingOnlyBuilder =