diff options
| author | Angus Kong <shkong@google.com> | 2013-04-19 17:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-19 17:25:58 +0000 |
| commit | 45826e188598cd6171fc0ec3112e2fbf52fbc952 (patch) | |
| tree | 3a3cbf560c5e1ee4e1c4f7c63ab0b77720aacfb5 /src | |
| parent | b10518142bb84abe2ffe1bd3aa10ff4ee7982370 (diff) | |
| parent | 5b532be33f0e31712ad2b4f2838a282d82c6baa0 (diff) | |
| download | android_packages_apps_Gallery2-45826e188598cd6171fc0ec3112e2fbf52fbc952.tar.gz android_packages_apps_Gallery2-45826e188598cd6171fc0ec3112e2fbf52fbc952.tar.bz2 android_packages_apps_Gallery2-45826e188598cd6171fc0ec3112e2fbf52fbc952.zip | |
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index d4be225a0..7ebc0e841 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1490,6 +1490,7 @@ public class VideoModule implements CameraModule, return; } + if (!mActivity.mCameraDevice.waitDone()) return; mCurrentVideoUri = null; if (effectsActive()) { initializeEffectsRecording(); |