diff options
| author | Ed Heyl <ed@google.com> | 2011-10-25 19:50:39 +0000 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-25 19:50:39 +0000 |
| commit | b8bd7ee0f8b0c3e0381ae6364bbeca4f28bdf7a4 (patch) | |
| tree | 40df7dfcac9f8449a6dacb671954bb485000d5bd /src/com/android/camera/EffectsRecorder.java | |
| parent | 9c890bec972061e0e52b41a16a43d3b8fed73d34 (diff) | |
| parent | c04d01bb510465ea35a06b09146a3bb79c6f770e (diff) | |
| download | LegacyCamera-b8bd7ee0f8b0c3e0381ae6364bbeca4f28bdf7a4.zip LegacyCamera-b8bd7ee0f8b0c3e0381ae6364bbeca4f28bdf7a4.tar.gz LegacyCamera-b8bd7ee0f8b0c3e0381ae6364bbeca4f28bdf7a4.tar.bz2 | |
Merge remote branch 'goog/ics-mr0' into ics-mr1
Diffstat (limited to 'src/com/android/camera/EffectsRecorder.java')
| -rw-r--r-- | src/com/android/camera/EffectsRecorder.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java index d3b277d..a561011 100644 --- a/src/com/android/camera/EffectsRecorder.java +++ b/src/com/android/camera/EffectsRecorder.java @@ -562,8 +562,19 @@ public class EffectsRecorder { synchronized(EffectsRecorder.this) { mTextureSource = source; - if (mState == STATE_RELEASED) return; - + if (mState == STATE_CONFIGURE) { + // Stop preview happened while the runner was doing startup tasks + // Since we haven't started anything up, don't do anything + // Rest of cleanup will happen in onRunnerDone + if (mLogVerbose) Log.v(TAG, "Ready callback: Already stopped, skipping."); + return; + } + if (mState == STATE_RELEASED) { + // EffectsRecorder has been released, so don't touch the camera device + // or anything else + if (mLogVerbose) Log.v(TAG, "Ready callback: Already released, skipping."); + return; + } if (source == null) { if (mState == STATE_PREVIEW || mState == STATE_STARTING_PREVIEW || |