From 7993f4521011869a794da69e4d0057fe3b0886c3 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 12 Jul 2013 11:36:47 -0700
Subject: [PATCH] Always set focus mode first before applying scene mode

cherrypick from Bryce branch

  Bug: 9577903
  Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
---
 src/com/android/camera/PhotoModule.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 9bde1c1b3..2afaf5bf5 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1613,6 +1613,10 @@ public class PhotoModule
         setFocusAreasIfSupported();
         setMeteringAreasIfSupported();
 
+        // initialize focus mode
+        mFocusManager.overrideFocusMode(null);
+        mParameters.setFocusMode(mFocusManager.getFocusMode());
+
         // Set picture size.
         String pictureSize = mPreferences.getString(
                 CameraSettings.KEY_PICTURE_SIZE, null);
-- 
2.11.0