From 53a2b18514beafc77a831fbf4f416ff7a41a0d6e Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Mon, 2 May 2016 10:53:55 -0700
Subject: 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
---
 src/com/android/camera/PhotoModule.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b7a9dd88a..133d73dd7 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2348,7 +2348,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;
-- 
cgit v1.2.3