diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-03-08 07:58:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-08 07:58:34 -0800 |
| commit | 9d4ff8b41cb6b58411b73cf38fe2303ca736518b (patch) | |
| tree | 202c872b96c580f8e3627b6c26e1d336541f20d1 /libcamera/SecCameraHWInterface.cpp | |
| parent | 95b9168a7432700ecf34e39208d28e8befae3dfb (diff) | |
| parent | 2d6a603741d29c692b46b4828a9a43b9af434bfe (diff) | |
| download | device_samsung_crespo-9d4ff8b41cb6b58411b73cf38fe2303ca736518b.zip device_samsung_crespo-9d4ff8b41cb6b58411b73cf38fe2303ca736518b.tar.gz device_samsung_crespo-9d4ff8b41cb6b58411b73cf38fe2303ca736518b.tar.bz2 | |
am 2d6a6037: am 28e8633c: Merge "libcamera: Fix setParameters crash when opening front camera." into gingerbread
* commit '2d6a603741d29c692b46b4828a9a43b9af434bfe':
libcamera: Fix setParameters crash when opening front camera.
Diffstat (limited to 'libcamera/SecCameraHWInterface.cpp')
| -rw-r--r-- | libcamera/SecCameraHWInterface.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libcamera/SecCameraHWInterface.cpp b/libcamera/SecCameraHWInterface.cpp index fffe15b..5228e18 100644 --- a/libcamera/SecCameraHWInterface.cpp +++ b/libcamera/SecCameraHWInterface.cpp @@ -156,8 +156,6 @@ void CameraHardwareSec::initDefaultParameters(int cameraId) int snapshot_max_width = 0; int snapshot_max_height = 0; - /* set camera ID & reset camera */ - mSecCamera->setCameraId(cameraId); if (cameraId == SecCamera::CAMERA_ID_BACK) { p.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "720x480,640x480,352x288,176x144"); |