summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-05-02 10:53:55 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:46 -0700
commit53a2b18514beafc77a831fbf4f416ff7a41a0d6e (patch)
treef8d2d2f1982afb0784ac9c8ffcc8bb6feb674d70
parent72cf374de3e7d2d18eb53fa797342dbae926413a (diff)
downloadandroid_packages_apps_Snap-53a2b18514beafc77a831fbf4f416ff7a41a0d6e.zip
android_packages_apps_Snap-53a2b18514beafc77a831fbf4f416ff7a41a0d6e.tar.gz
android_packages_apps_Snap-53a2b18514beafc77a831fbf4f416ff7a41a0d6e.tar.bz2
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
-rw-r--r--src/com/android/camera/PhotoModule.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b7a9dd8..133d73d 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;