commit 77db815c740427774423e8dc8256a1f2ce68aeca
author Eino-Ville Talvala <etalvala@google.com> Fri Oct 14 13:46:36 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 14 13:46:36 2011 -0700
tree 7c8fe8f1702c02b850eff1b71cca003fa20347db
parent 15a67d9091b23e2bf07469b334b59788c94529bc
parent f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c

am f3b7efa2: Disable AE/AWB locking when shutting down effects.

* commit 'f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c':
  Disable AE/AWB locking when shutting down effects.

src/com/android/camera/EffectsRecorder.java

diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index 8f72a8b..3059281 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -707,6 +707,7 @@
                 } else if (mState != STATE_RELEASED) {
                     // Shutting down effects
                     if (mLogVerbose) Log.v(TAG, "Runner halted, restoring direct preview");
+                    tryEnable3ALocks(false);
                     sendMessage(EFFECT_NONE, EFFECT_MSG_EFFECTS_STOPPED);
                 } else {
                     // STATE_RELEASED - camera will be/has been released as well, do nothing.