am 0462b64d: am de6ac8e5: am c6e249db: Merge "StartPreview only after setting fps range paramters" into gingerbread
* commit '0462b64d957c6333ef7989d62df47dc017941ce6':
StartPreview only after setting fps range paramters
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 9f08940..d75b5bc 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -1575,7 +1575,6 @@
private void testPreviewFpsRangeByCamera(int cameraId) throws Exception {
initializeMessageLooper(cameraId);
mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
- mCamera.startPreview();
// Test if the parameters exists and minimum fps <= maximum fps.
int[] defaultFps = new int[2];