commit f3d505afe66e0961e904027e8ab98455ccd3bd2e
author Rodrigo Carceroni <carceroni@google.com> Fri Oct 14 14:00:39 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 14 14:00:39 2011 -0700
tree 4982cc864aa4f041c5fb17082aed9d7d2a9a1df6
parent f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c
parent caf8466dcdf6d6c496e46961bb3132126363ef83

Merge "Bug 5383077: handle video thumbnail generation correctly when effects are on" into ics-mr0

src/com/android/camera/EffectsRecorder.java

diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index f9ac483..5e8bfc1 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -720,6 +720,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.