diff options
author | Jay Wang <jaywang@codeaurora.org> | 2016-05-02 10:53:55 -0700 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2016-05-02 13:59:38 -0700 |
commit | 1220ff1fb14d08f3f3f24c61cf57e538e93fff92 (patch) | |
tree | 654712670cd6a0ea23105c683c71eee090a49952 /src/com/android/camera/PhotoModule.java | |
parent | 77249ce0c5fda9ac0e18486199e47a5f715ef099 (diff) | |
download | android_packages_apps_Snap-1220ff1fb14d08f3f3f24c61cf57e538e93fff92.tar.gz android_packages_apps_Snap-1220ff1fb14d08f3f3f24c61cf57e538e93fff92.tar.bz2 android_packages_apps_Snap-1220ff1fb14d08f3f3f24c61cf57e538e93fff92.zip |
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
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
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; |