SnapdragonCamera: Fix incorrect focus mode

The camera device parameter was not re-set when the camera is
switched back from camcorder mode. This causes the camera mode
uses previous camera focus mode which was selected before
switching to camcorder mode.

CRs-Fixed: 1006900
Change-Id: I20bce0413d7f422da86acd44c39b27582593614d

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 4d2ec6ad8..7324484ae 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2360,7 +2360,11 @@ public class PhotoModule
         mParameters = mCameraDevice.getParameters();
         mCameraPreviewParamsReady = true;
         mInitialParams = mParameters;
-        if (mFocusManager == null) initializeFocusManager();
+        if (mFocusManager == null) {
+            initializeFocusManager();
+        } else {
+            mFocusManager.setParameters(mInitialParams);
+        }
         initializeCapabilities();
         mHandler.sendEmptyMessageDelayed(CAMERA_OPEN_DONE, 100);
         return;