commit a58b42dfecf76f3c066a543f95fdb16e85d5d3b1
author Eino-Ville Talvala <etalvala@google.com> Fri Jan 04 14:26:49 2013 -0800
committer Eino-Ville Talvala <etalvala@google.com> Fri Jan 04 15:14:07 2013 -0800
tree f552003ac6d9d0292da8b82a907bba628405c9c1
parent 9d35e00164820884b0c3922478c09e04f3dd78e9

Camera: Fix duplicated code.

Due to two identical commits (15fd82319b and 6d8e5b08) getting merged
into jb-mr1-dev and master, duplicate code ended up in the camera
library after the second commit automerged into master.

Remove the duplicate lines to fix CTS failure.

Change-Id: Id91e3c9775f7191d1725cb6866fd2d972c3a0584

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 5b399ec..ea90d05 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -3229,14 +3229,6 @@
             } else {
                 shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
             }
-            if (m_wideAspect) {
-//                shot_ext->setfile = ISS_SUB_SCENARIO_VIDEO;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[0] = 30;
-                shot_ext->shot.ctl.aa.aeTargetFpsRange[1] = 30;
-            }
-            else {
-//                shot_ext->setfile = ISS_SUB_SCENARIO_STILL;
-            }
             if (triggered)
                 shot_ext->shot.ctl.aa.afTrigger = 1;