diff --git a/QCameraHWI.cpp b/QCameraHWI.cpp
index 7c43a87..be6c6e5 100644
--- a/QCameraHWI.cpp
+++ b/QCameraHWI.cpp
@@ -1662,7 +1662,7 @@
 
     if(QCAMERA_HAL_RECORDING_STARTED != mPreviewState){
       isp3a_af_mode_t afMode = getAutoFocusMode(mParameters);
-      if (afMode != AF_MODE_CAF)
+      if (afMode != AF_MODE_CAF && !mFlashCond)
       {
         mFlashCond = getFlashCondition();
       }
diff --git a/QCameraHWI_Parm.cpp b/QCameraHWI_Parm.cpp
index 002b68a..7b1668c 100644
--- a/QCameraHWI_Parm.cpp
+++ b/QCameraHWI_Parm.cpp
@@ -150,7 +150,8 @@
   { 1920, 1080}, // HD1080
   { 1600, 1200}, // 2MP UXGA
   { 1280, 960}, // 1.3MP
-  { 800, 600}, // SVGA
+  { 1280, 720},
+  { 720, 480},
   { 800, 480}, // WVGA
   { 640, 480}, // VGA
   { 352, 288}, // CIF