commit 2239fdaf0c71972dee43c16b3a7ef24117ce2488
author The Android Automerger <android-build@android.com> Tue Dec 04 19:59:02 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Dec 04 19:59:02 2012 -0800
tree a04667a27b2b2a212cf6326179b9583355b53edb
parent 21fddc5f27b9d2841736a98a9f39e2651c50606d
parent 722c2bb360cf8362091f395a9ad66bf60799e1f2

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

QCameraHWI.cpp

diff --git a/QCameraHWI.cpp b/QCameraHWI.cpp
index cd14417..a957821 100644
--- a/QCameraHWI.cpp
+++ b/QCameraHWI.cpp
@@ -1079,22 +1079,8 @@
         mParameters.setPreviewFrameRateMode("frame-rate-auto");
         setPreviewFrameRateMode(mParameters);
 
-        if (mHasAutoFocusSupport) {
-            int cafSupport = true;
-            int caf_type = 2;
-            native_set_parms(MM_CAMERA_PARM_CAF_TYPE, sizeof(caf_type), (void *)&caf_type);
-            native_set_parms(MM_CAMERA_PARM_CONTINUOUS_AF, sizeof(cafSupport),
-                                   (void *)&cafSupport);
-        }
     }
 
-     if (mHasAutoFocusSupport && strcmp(str, "auto")) {
-         int cafSupport = true;
-         int caf_type = 2;
-         native_set_parms(MM_CAMERA_PARM_CAF_TYPE, sizeof(caf_type), (void *)&caf_type);
-         native_set_parms(MM_CAMERA_PARM_CONTINUOUS_AF, sizeof(cafSupport),
-                               (void *)&cafSupport);
-     }
     /*  get existing preview information, by qury mm_camera*/
     memset(&dim, 0, sizeof(cam_ctrl_dimension_t));
     ret = cam_config_get_parm(mCameraId, MM_CAMERA_PARM_DIMENSION,&dim);