diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-17 13:18:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-17 13:18:08 -0700 |
| commit | 584aa9b015429bf7346fd44b5252c7ece98e675f (patch) | |
| tree | c7a08932e1d883cc395c57b2cc87e84da8afcc31 | |
| parent | 2b78a9d18f48925f441f6f539e11dd48b345eba0 (diff) | |
| parent | 1220ff1fb14d08f3f3f24c61cf57e538e93fff92 (diff) | |
| download | android_packages_apps_Snap-584aa9b015429bf7346fd44b5252c7ece98e675f.tar.gz android_packages_apps_Snap-584aa9b015429bf7346fd44b5252c7ece98e675f.tar.bz2 android_packages_apps_Snap-584aa9b015429bf7346fd44b5252c7ece98e675f.zip | |
Merge "SnapdragonCamera: Fix incorrect focus mode" into camera.lnx.1.0-dev.1.0
| -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; |