diff options
| author | Keith Deacon <kdeacon@ti.com> | 2012-11-09 14:38:02 -0600 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 20:17:45 +0200 |
| commit | f38c26d1e144d89556903ff27b85f52290234ff1 (patch) | |
| tree | 4f13ff546facd166f80b344ae7ea5f5370197651 /camera | |
| parent | 688b4ebe94e90db255ea2a779bcd110e20bf4fe6 (diff) | |
| parent | b1761a91e627e87c219b06f8852dbb7c37dc653a (diff) | |
| download | hardware_ti_omap4-f38c26d1e144d89556903ff27b85f52290234ff1.zip hardware_ti_omap4-f38c26d1e144d89556903ff27b85f52290234ff1.tar.gz hardware_ti_omap4-f38c26d1e144d89556903ff27b85f52290234ff1.tar.bz2 | |
Merge d-jb-release into d-jb-mr0-release
Change-Id: Id3028c34bfcbbe8b0e3817f29ea62025db30e92f
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraHal.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index a605026..e3bee43 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -2799,7 +2799,6 @@ status_t CameraHal::restartPreview() android::AutoMutex lock(mLock); if (!mCapModeBackup.isEmpty()) { mParameters.set(TICameraParameters::KEY_CAP_MODE, mCapModeBackup.string()); - mCapModeBackup = ""; } else { mParameters.set(TICameraParameters::KEY_CAP_MODE, ""); } |